svn rev #21621: trunk/src/slave/

[epeisach@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21621
Commit By: epeisach
Log Message:
Handle a number of warnings - including missing prototype,
paraenthesis in conditionals, unused function removal, unused variable
removal.




Changed Files:
U   trunk/src/slave/kpropd.c
Modified: trunk/src/slave/kpropd.c
===================================================================
--- trunk/src/slave/kpropd.c	2008-12-28 22:41:09 UTC (rev 21620)
+++ trunk/src/slave/kpropd.c	2008-12-29 03:36:57 UTC (rev 21621)
@@ -249,7 +249,7 @@
     exit(ret);
 }
 
-void resync_alarm(int sn)
+static void resync_alarm(int sn)
 {
     close (gfd);
     if (debug)
@@ -639,8 +639,9 @@
 	params.realm = def_realm;
 
 	if (master_svc_princstr == NULL) {
-		if (retval = kadm5_get_kiprop_host_srv_name(kpropd_context,
-					def_realm, &master_svc_princstr)) {
+		if ((retval = kadm5_get_kiprop_host_srv_name(kpropd_context,
+							     def_realm, 
+							     &master_svc_princstr))) {
 			com_err(progname, retval,
 				_("%s: unable to get kiprop host based "
 					"service name for realm %s\n"),
@@ -652,7 +653,7 @@
 	/*
 	 * Set cc to the default credentials cache
 	 */
-	if (retval = krb5_cc_default(kpropd_context, &cc)) {
+	if ((retval = krb5_cc_default(kpropd_context, &cc))) {
 		com_err(progname, retval,
 			_("while opening default "
 				"credentials cache"));
@@ -682,8 +683,8 @@
 	    }
 	    /* XXX Memory leak: Old r->data value.  */
 	}
-	if (retval = krb5_unparse_name(kpropd_context, iprop_svc_principal,
-				&iprop_svc_princstr)) {
+	if ((retval = krb5_unparse_name(kpropd_context, iprop_svc_principal,
+					&iprop_svc_princstr))) {
 		com_err(progname, retval,
 			_("while canonicalizing principal name"));
 		krb5_free_principal(kpropd_context, iprop_svc_principal);
@@ -950,7 +951,7 @@
 		free(iprop_svc_princstr);
 	if (master_svc_princstr)
 		free(master_svc_princstr);
-	if (retval = krb5_cc_close(kpropd_context, cc)) {
+	if ((retval = krb5_cc_close(kpropd_context, cc))) {
 		com_err(progname, retval,
 			_("while closing default ccache"));
 		exit(1);
@@ -984,17 +985,6 @@
 	return (btime);
 }
 
-
-static char *
-copy_leading_substring(char *src, size_t len)
-{
-    char *result;
-    result = malloc((len + 1) * sizeof(char));
-    (void) strncpy(result, src, len+1);
-    result[len] = 0;
-    return result;
-}
-
 static void
 kpropd_com_err_proc(whoami, code, fmt, args)
 	const char	*whoami;
@@ -1669,7 +1659,6 @@
 			       const char *realm,
 			       char **host_service_name)
 {
-	kadm5_ret_t ret;
 	char *name;
 	char *host;