[Fedora-directory-commits] ldapserver/ldap/servers/plugins/shared utils.c, 1.6, 1.7

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/shared
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/ldap/servers/plugins/shared

Modified Files:
	utils.c 
Log Message:
Resolves: #188320
Summary: HP-UX: warnings reported by the HP-UX compiler



Index: utils.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/shared/utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- utils.c	10 Nov 2006 23:45:30 -0000	1.6
+++ utils.c	18 Oct 2007 00:08:32 -0000	1.7
@@ -97,7 +97,6 @@
 Slapi_PBlock *
 readPblockAndEntry( const char *baseDN, const char *filter,
 					char *attrs[] ) {
-	int result = 0;
 	Slapi_PBlock *spb = NULL;
 
 	BEGIN
@@ -107,15 +106,15 @@
 		spb = slapi_search_internal((char *)baseDN, LDAP_SCOPE_BASE,
 									(char *)filter, NULL, attrs, 0);
 		if ( !spb ) {
-			result = op_error(20);
+			op_error(20);
 			break;
 		}
  
 		if ( slapi_pblock_get( spb, SLAPI_PLUGIN_INTOP_RESULT, &sres ) ) {
-			result = op_error(21);
+			op_error(21);
 			break;
 		} else if (sres) {
-			result = op_error(22);
+			op_error(22);
 			break;
 		}
     END
@@ -166,7 +165,6 @@
  */
 Slapi_PBlock *
 dnHasObjectClass( const char *baseDN, const char *objectClass ) {
-	int result = 0;
 	char *filter = NULL;
 	Slapi_PBlock *spb = NULL;
 
@@ -184,7 +182,7 @@
  
 		if ( slapi_pblock_get(spb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES,
 							  &entries) ) {
-			result = op_error(23);
+			op_error(23);
 			break;
 		}
 		/*
@@ -213,7 +211,6 @@
  */
 Slapi_PBlock *
 dnHasAttribute( const char *baseDN, const char *attrName ) {
-	int result = 0;
 	Slapi_PBlock *spb = NULL;
 	char *filter = NULL;
 
@@ -229,21 +226,21 @@
 		spb = slapi_search_internal((char *)baseDN, LDAP_SCOPE_BASE,
 									filter, NULL, attrs, 0);
 		if ( !spb ) {
-			result = op_error(20);
+			op_error(20);
 			break;
 		}
  
 		if ( slapi_pblock_get( spb, SLAPI_PLUGIN_INTOP_RESULT, &sres ) ) {
-			result = op_error(21);
+			op_error(21);
 			break;
 		} else if (sres) {
-			result = op_error(22);
+			op_error(22);
 			break;
 		}
 
 		if ( slapi_pblock_get(spb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES,
 							  &entries) ) {
-			result = op_error(23);
+			op_error(23);
 			break;
 		}
 		/*