[Fedora-directory-commits] ldapserver/lib/base crit.cpp, 1.6, 1.7 file.cpp, 1.8, 1.9

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/lib/base

Modified Files:
	crit.cpp file.cpp 
Log Message:
Resolves: #188320
Summary: HP-UX: warnings reported by the HP-UX compiler



Index: crit.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/base/crit.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- crit.cpp	10 Nov 2006 23:45:59 -0000	1.6
+++ crit.cpp	18 Oct 2007 00:08:36 -0000	1.7
@@ -150,7 +150,6 @@
         crit->owner = 0;
         PR_Unlock(crit->lock);
     }
-    PR_ASSERT(crit->count >= 0);
 #endif
 }
 
@@ -346,9 +345,9 @@
 cs_wait(COUNTING_SEMAPHORE csp)
 {
 	counting_sem_t *cs = (counting_sem_t *)csp;
+#if defined(SOLARIS) && defined(HW_THREADS)
 	int ret;
 
-#if defined(SOLARIS) && defined(HW_THREADS)
     if ( (ret = sema_wait(cs)) < 0 ) {
 		ereport(LOG_FAILURE, XP_GetAdminStr(DBT_csWaitFailureS_), system_errmsg());
 		return -1;
@@ -366,7 +365,7 @@
 		crit_exit(cs->cv_lock);
 		crit_enter(cs->lock);
 	}
-	ret = --(cs->count);
+	--(cs->count);
 	crit_exit(cs->lock);
 
 	return 0;
@@ -377,18 +376,19 @@
 cs_trywait(COUNTING_SEMAPHORE csp)
 {
 	counting_sem_t *cs = (counting_sem_t *)csp;
-	int ret;
 
 #if defined(SOLARIS) && defined(HW_THREADS)
+	int ret;
 	ret = sema_trywait(cs)?-1:0;
     return ret;
 #elif defined(IRIX) && defined(HW_THREADS)
+	int ret;
 	ret = uscpsema(cs);
 	return (ret == 1)?0:-1;
 #else
 	crit_enter(cs->lock);
 	if (cs->count > 0) {
-		ret = --(cs->count);
+		--(cs->count);
 		crit_exit(cs->lock);
         return 0;
     }
@@ -402,9 +402,9 @@
 cs_release(COUNTING_SEMAPHORE csp)
 {
 	counting_sem_t *cs = (counting_sem_t *)csp;
-	int ret;
 
 #if defined(SOLARIS) && defined(HW_THREADS)
+	int ret;
     if ( (ret = sema_post(cs)) < 0 ) {
 		ereport(LOG_FAILURE, XP_GetAdminStr(DBT_csPostFailureS_), system_errmsg());
 		return -1;
@@ -415,7 +415,7 @@
 	return 0;
 #else
 	crit_enter(cs->lock);
-	ret = ++(cs->count);
+	++(cs->count);
 	if (cs->count == 1) {
 		crit_enter(cs->cv_lock);
 		condvar_notify(cs->cv);


Index: file.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/base/file.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- file.cpp	10 Nov 2006 23:45:59 -0000	1.8
+++ file.cpp	18 Oct 2007 00:08:36 -0000	1.9
@@ -565,19 +565,11 @@
     char static_error[128];
     char *lmsg = 0; /* Local message pointer */
     size_t msglen = 0;
-    int sys_error = 0;
     PRErrorCode nscp_error;
 #ifdef XP_WIN32
     LPTSTR sysmsg = 0;
 #endif
 
-
-    /* Grab the OS error message */
-#ifdef XP_WIN32
-    sys_error = GetLastError();
-#else
-    sys_error = errno;
-#endif
     nscp_error = PR_GetError();
 
     /* If there is a NSPR error, but it is "unknown", try to get the OSError