be& was passed uninitialized to read_config()

[openldap] / include / srchpref.h

diff --git a/include/srchpref.h b/include/srchpref.h
index a1d65cffb0a4e0ea1281ab90ac245b12107e5f5d..6b26b06d41e054ce34dc7ae149c4e62cbad845d4 100644 (file)
--- a/include/srchpref.h
+++ b/include/srchpref.h
@@ -17,10 +17,9 @@
 #ifndef _SRCHPREF_H
 #define _SRCHPREF_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <ldap_cdefs.h>
 
+LDAP_BEGIN_DECL
 
 struct ldap_searchattr {
        char                            *sa_attrlabel;
@@ -60,7 +59,7 @@ struct ldap_searchobj {
 #define LDAP_SEARCHOBJ_OPT_INTERNAL    0x00000001
 
 #define LDAP_IS_SEARCHOBJ_OPTION_SET( so, option )     \
-       (((so)->so_options & option ) != 0 )
+       (((so)->so_options & (option) ) != 0 )
 
 #define LDAP_SEARCHPREF_VERSION_ZERO   0
 #define LDAP_SEARCHPREF_VERSION                1
@@ -71,36 +70,26 @@ struct ldap_searchobj {
 #define LDAP_SEARCHPREF_ERR_FILE       4
 
 
-#ifndef NEEDPROTOS
-int                    ldap_init_searchprefs();
-int                    ldap_init_searchprefs_buf();
-void                   ldap_free_searchprefs();
-struct ldap_searchobj  *ldap_first_searchobj();
-struct ldap_searchobj  *ldap_next_searchobj();
+LDAP_F int
+ldap_init_searchprefs LDAP_P(( char *file,
+       struct ldap_searchobj **solistp ));
 
-#else /* !NEEDPROTOS */
+LDAP_F int
+ldap_init_searchprefs_buf LDAP_P(( char *buf,
+       long buflen,
+       struct ldap_searchobj **solistp ));
 
-LDAPFUNCDECL int
-ldap_init_searchprefs( char *file, struct ldap_searchobj **solistp );
+LDAP_F void
+ldap_free_searchprefs LDAP_P(( struct ldap_searchobj *solist ));
 
-LDAPFUNCDECL int
-ldap_init_searchprefs_buf( char *buf, long buflen,
-       struct ldap_searchobj **solistp );
+LDAP_F struct ldap_searchobj *
+ldap_first_searchobj LDAP_P(( struct ldap_searchobj *solist ));
 
-LDAPFUNCDECL void
-ldap_free_searchprefs( struct ldap_searchobj *solist );
+LDAP_F struct ldap_searchobj *
+ldap_next_searchobj LDAP_P(( struct ldap_searchobj *sollist,
+       struct ldap_searchobj *so ));
 
-LDAPFUNCDECL struct ldap_searchobj *
-ldap_first_searchobj( struct ldap_searchobj *solist );
 
-LDAPFUNCDECL struct ldap_searchobj *
-ldap_next_searchobj( struct ldap_searchobj *sollist,
-       struct ldap_searchobj *so );
+LDAP_END_DECL
 
-#endif /* !NEEDPROTOS */
-
-
-#ifdef __cplusplus
-}
-#endif
 #endif /* _SRCHPREF_H */