Fix cursor initialization, scope IDs

[openldap] / servers / slurpd / proto-slurp.h

diff --git a/servers/slurpd/proto-slurp.h b/servers/slurpd/proto-slurp.h
index 56e32829021be96de76a665d45dd22359e0dc05e..bdcce9ad688fda088a725e2e9d702995c5d78f6b 100644 (file)
--- a/servers/slurpd/proto-slurp.h
+++ b/servers/slurpd/proto-slurp.h
@@ -1,3 +1,8 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 #ifndef _PROTO_SLURP
 #define _PROTO_SLURP
 
@@ -12,10 +17,17 @@ RETSIGTYPE do_admin LDAP_P((int sig));
 int doargs     LDAP_P((int argc, char **argv, struct globals *g));
 
 /* ch_malloc.c */
-void *ch_malloc        LDAP_P((unsigned long size));
-void *ch_realloc       LDAP_P((void *block, unsigned long size));
-void *ch_calloc        LDAP_P((unsigned long nelem, unsigned long size));
+#ifdef CSRIMALLOC
+#define ch_malloc malloc
+#define ch_realloc realloc
+#define ch_calloc calloc
+#define ch_free free
+#else
+void *ch_malloc        LDAP_P((ber_len_t size));
+void *ch_realloc       LDAP_P((void *block, ber_len_t size));
+void *ch_calloc        LDAP_P((ber_len_t nelem, ber_len_t size));
 void ch_free   LDAP_P((void *p));
+#endif
 
 /* config.c */
 int slurpd_read_config LDAP_P((char *fname));
@@ -26,6 +38,7 @@ void ch_free LDAP_P(( void *p ));
 /* fm.c */
 void *fm       LDAP_P((void *arg));
 RETSIGTYPE do_nothing  LDAP_P((int i));
+RETSIGTYPE slurp_set_shutdown LDAP_P((int));
 
 /* globals.c */
 extern struct globals *sglob;
@@ -38,10 +51,10 @@ extern struct globals *init_globals LDAP_P((void));
 int do_ldap    LDAP_P((Ri *ri, Re *re, char **errmsg));
 
 /* lock.c */
-FILE *lock_fopen       LDAP_P((char *fname, char *type, FILE **lfp));
+FILE *lock_fopen       LDAP_P((const char *fname, const char *type, FILE **lfp));
 int lock_fclose        LDAP_P((FILE *fp, FILE *lfp));
-int acquire_lock       LDAP_P((char *file, FILE **rfp, FILE **lfp));
-int relinquish_lock    LDAP_P((char *file, FILE *rfp, FILE *lfp));
+int acquire_lock       LDAP_P((const char *file, FILE **rfp, FILE **lfp));
+int relinquish_lock    LDAP_P((const char *file, FILE *rfp, FILE *lfp));
 
 /* reject.c */
 void write_reject      LDAP_P((Ri *ri, Re *re, int lderr, char *errmsg));