From 12191bfc066c7092c11ca207a6372bee60c72a8d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 17 Jun 2004 00:45:32 +0000 Subject: [PATCH] ITS#3166 prototype fix --- CHANGES | 1 + include/slapi-plugin.h | 6 +++--- servers/slapd/slapi/proto-slapi.h | 6 +++--- servers/slapd/slapi/slapi_utils.c | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 73256df6ff..d317ffb6f2 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,7 @@ OpenLDAP 2.2.14 Engineering Fixed back-bdb pagedResults clear controls bug (ITS#3182) Fixed back-bdb pagedResults ignore control bug Fixed back-hdb empty suffix bugs (ITS#3063,3186) + Fixed slapi prototypes bug (ITS#3166) Fixed slapi internal search limit bugs (ITS#3183) Added slapd -l USER/DAEMON options (ITS#3187) Build environments diff --git a/include/slapi-plugin.h b/include/slapi-plugin.h index b1a7595d72..d21c5471c6 100644 --- a/include/slapi-plugin.h +++ b/include/slapi-plugin.h @@ -52,9 +52,9 @@ int slapi_entry_attr_merge( Slapi_Entry *e, char *type, struct berval **vals ); int slapi_entry_attr_find( Slapi_Entry *e, char *type, Slapi_Attr **attr ); char *slapi_entry_attr_get_charptr( const Slapi_Entry *e, const char *type ); int slapi_entry_attr_get_int( const Slapi_Entry *e, const char *type ); -int slapi_entry_attr_get_long( const Slapi_Entry *e, const char *type ); -int slapi_entry_attr_get_uint( const Slapi_Entry *e, const char *type ); -int slapi_entry_attr_get_ulong( const Slapi_Entry *e, const char *type ); +long slapi_entry_attr_get_long( const Slapi_Entry *e, const char *type ); +unsigned int slapi_entry_attr_get_uint( const Slapi_Entry *e, const char *type ); +unsigned long slapi_entry_attr_get_ulong( const Slapi_Entry *e, const char *type ); int slapi_attr_get_values( Slapi_Attr *attr, struct berval ***vals ); char *slapi_dn_normalize( char *dn ); char *slapi_dn_normalize_case( char *dn ); diff --git a/servers/slapd/slapi/proto-slapi.h b/servers/slapd/slapi/proto-slapi.h index 5036d02299..b39fe0c0f0 100644 --- a/servers/slapd/slapi/proto-slapi.h +++ b/servers/slapd/slapi/proto-slapi.h @@ -37,9 +37,9 @@ extern int slapi_entry_attr_find( Slapi_Entry *e, char *type, Slapi_Attr **attr extern char *slapi_entry_attr_get_charptr( const Slapi_Entry *e, const char *type ); extern int slapi_entry_attr_delete( Slapi_Entry *e, char *type ); extern int slapi_entry_attr_get_int( const Slapi_Entry *e, const char *type ); -extern int slapi_entry_attr_get_long( const Slapi_Entry *e, const char *type ); -extern int slapi_entry_attr_get_uint( const Slapi_Entry *e, const char *type ); -extern int slapi_entry_attr_get_ulong( const Slapi_Entry *e, const char *type ); +extern long slapi_entry_attr_get_long( const Slapi_Entry *e, const char *type ); +extern unsigned int slapi_entry_attr_get_uint( const Slapi_Entry *e, const char *type ); +extern unsigned long slapi_entry_attr_get_ulong( const Slapi_Entry *e, const char *type ); extern int slapi_entry_attr_hasvalue( Slapi_Entry *e, const char *type, const char *value ); extern int slapi_entry_attr_merge_sv( Slapi_Entry *e, const char *type, Slapi_Value **vals ); extern void slapi_entry_attr_set_charptr(Slapi_Entry* e, const char *type, const char *value); diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c index d9ceeb43db..1a082f4257 100644 --- a/servers/slapd/slapi/slapi_utils.c +++ b/servers/slapd/slapi/slapi_utils.c @@ -348,7 +348,7 @@ slapi_entry_attr_get_int( const Slapi_Entry *e, const char *type ) #endif } -int +long slapi_entry_attr_get_long( const Slapi_Entry *e, const char *type ) { #ifdef LDAP_SLAPI @@ -373,7 +373,7 @@ slapi_entry_attr_get_long( const Slapi_Entry *e, const char *type ) #endif } -int +unsigned int slapi_entry_attr_get_uint( const Slapi_Entry *e, const char *type ) { #ifdef LDAP_SLAPI @@ -398,7 +398,7 @@ slapi_entry_attr_get_uint( const Slapi_Entry *e, const char *type ) #endif } -int +unsigned long slapi_entry_attr_get_ulong( const Slapi_Entry *e, const char *type ) { #ifdef LDAP_SLAPI -- 2.39.5