[Fedora-directory-commits] adminserver/lib/libdsa dsalib_location.c, 1.5, 1.6 dsalib_util.c, 1.4, 1.5

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/dirsec/adminserver/lib/libdsa
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1119/adminserver/lib/libdsa

Modified Files:
	dsalib_location.c dsalib_util.c 
Log Message:
Fix various compiler warnings about define redefinitions, unused functions/variables, wrong types being cast, etc. 


Index: dsalib_location.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_location.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dsalib_location.c	31 Aug 2007 17:01:38 -0000	1.5
+++ dsalib_location.c	4 Dec 2008 20:01:29 -0000	1.6
@@ -39,7 +39,6 @@
 ds_get_instance_dir()
 {
     char        *ds_name;
-    static char instance_dir[PATH_MAX];
  
     if ( (ds_name = ds_get_server_name()) == NULL ) {
         return(NULL);
@@ -60,7 +59,7 @@
     char *configdir_env;
     static char configdir[PATH_MAX];
 
-    if (configdir_env = getenv("DS_CONFIG_DIR")) {
+    if ((configdir_env = getenv("DS_CONFIG_DIR"))) {
         return configdir_env;
     } else {
         if ( (ds_name = ds_get_server_name()) == NULL )
@@ -98,7 +97,7 @@
     char line[BIG_LINE];
     FILE *fp = NULL;
 
-    if (rundir_env = getenv("DS_RUN_DIR")) {
+    if ((rundir_env = getenv("DS_RUN_DIR"))) {
         return (rundir_env);
     } else {
         /* Find the run dir from the start script */
@@ -110,7 +109,7 @@
                 /* Find line starting with PIDFILE */
                 if (strncmp(line, "PIDFILE", 7) == 0) {
                     /* Chop off the pidfile name to get the run dir */
-                    if (p = strrchr(line, '/')) {
+                    if ((p = strrchr(line, '/'))) {
                         *p = '\0';
                         PR_snprintf(rundir, sizeof(rundir), "%s", line + 8);
                     }
@@ -152,7 +151,7 @@
 {
     char *bakdir;
 
-    if (bakdir = getenv("DS_BAK_DIR")) {
+    if ((bakdir = getenv("DS_BAK_DIR"))) {
         return bakdir;
     } else {
         return ds_get_config_value(DS_BAKDIR);
@@ -181,7 +180,7 @@
 {
     char *tmpdir;
 
-    if (tmpdir = getenv("DS_TMP_DIR")) {
+    if ((tmpdir = getenv("DS_TMP_DIR"))) {
         return tmpdir;
     } else {
         return ds_get_config_value(DS_TMPDIR);


Index: dsalib_util.c
===================================================================
RCS file: /cvs/dirsec/adminserver/lib/libdsa/dsalib_util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dsalib_util.c	14 Nov 2007 17:51:56 -0000	1.4
+++ dsalib_util.c	4 Dec 2008 20:01:29 -0000	1.5
@@ -20,6 +20,8 @@
 #  include <config.h>
 #endif
 
+#include <prtypes.h>
+
 #if defined( XP_WIN32 )
 #include <windows.h>
 #include <io.h>
@@ -492,82 +494,6 @@
 	DB_HOME_DIRECTORY
 };
 
-static int
-is_fullpath(char *path)
-{
-	int len;
-	if (NULL == path || '\0' == *path)
-		return 0;
-
-	if (FILE_PATHSEP == *path) /* UNIX */
-		return 1;
-
-	len = strlen(path);
-	if (len > 2)
-	{
-		if (':' == path[1] && ('/' == path[2] || '\\' == path[2])) /* Windows */
-			return 1;
-	}
-	return 0;
-}
-
-static char *
-get_dir_from_startslapd(char *loc, char *keyword)
-{
-	char *returnstr = NULL; 
-	char *ptr = NULL;
-	char *confdir = NULL;
-if (ds_search_file(loc, keyword, &returnstr) > 0 && returnstr) {
-		ptr = strchr(returnstr, '=');
-		if (NULL != ptr) {
-			confdir = strdup(++ptr);
-		}
-		free(returnstr);
-	}
-	return confdir;
-}
-
-static char *
-get_dir_from_config(char *config_dir, char *config_attr)
-{
-    char *configfile = NULL;
-	char *returnstr = NULL; 
-	char *ptr = NULL;
-	char *dir = NULL;
-	configfile = PR_smprintf("%s%c%s", config_dir, FILE_PATHSEP, DS_CONFIG_FILE);
-	if (configfile && ds_search_file(configfile, config_attr, &returnstr) > 0
-		&& returnstr) {
-		ptr = strchr(returnstr, ':');
-		if (NULL != ptr) {
-			while (' ' == *ptr || '\t' == *ptr) ptr++;
-			dir = strdup(ptr);
-		}
-		free(returnstr);
-		PR_smprintf_free(configfile);
-	}
-	return dir;
-}
-
-static int
-default_err_func(const char *path, const char *op, void *arg)
-{
-	PRInt32 errcode = PR_GetError();
-	char *msg;
-	const char *errtext;
-
-	if (!errcode || (errcode == PR_UNKNOWN_ERROR)) {
-		errcode = PR_GetOSError();
-		errtext = ds_system_errmsg();
-	} else {
-		errtext = PR_ErrorToString(errcode, PR_LANGUAGE_I_DEFAULT);
-	}
-
-	msg = PR_smprintf("%s %s: error code %d (%s)", op, path, errcode, errtext);
-	ds_send_error(msg, 0);
-	PR_smprintf_free(msg);
-	return 1; /* just continue */	
-}
-
 DS_EXPORT_SYMBOL int
 ds_remove_reg_key(void *base, const char *format, ...)
 {