dmraid/tools dmevent_tool.c

dmraid/tools dmevent_tool.c

[zkabelac]

CVSROOT:	/cvs/dm
Module name:	dmraid
Changes by:	zkabelac@sourceware.org	2010-07-13 20:15:35

Modified files:
	tools          : dmevent_tool.c 

Log message:
	Use static for _test_user_id()

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/tools/dmevent_tool.c.diff?cvsroot=dm&r1=1.2&r2=1.3

--- dmraid/tools/dmevent_tool.c	2010/05/27 20:56:36	1.2
+++ dmraid/tools/dmevent_tool.c	2010/07/13 20:15:31	1.3
@@ -114,7 +114,7 @@
 		"\n" , cmd, options, cmd, cmd, cmd, cmd, cmd, cmd, cmd);
 }
 
-void _test_user_id(void)
+static void _test_user_id(void)
 {
 	if (geteuid()) {
 		fprintf(stderr, "This utility needs to be run as root.\n");

dmraid/tools dmevent_tool.c

[zkabelac]

CVSROOT:	/cvs/dm
Module name:	dmraid
Changes by:	zkabelac@sourceware.org	2010-05-27 20:56:36

Modified files:
	tools          : dmevent_tool.c 

Log message:
	Fix compiler warnings

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/tools/dmevent_tool.c.diff?cvsroot=dm&r1=1.1&r2=1.2

--- dmraid/tools/dmevent_tool.c	2009/12/16 11:39:18	1.1
+++ dmraid/tools/dmevent_tool.c	2010/05/27 20:56:36	1.2
@@ -123,7 +123,7 @@
 }
 
 /* Increment option counters. */
-static _process_opt(int opt, const char *cmd)
+static void _process_opt(int opt, const char *cmd)
 {
 	struct opt_def_struct {
 		const char opt;		/* Option character. */
@@ -214,7 +214,7 @@
 /* main: Process command line options + arguments. */
 int main(int argc, char **argv)
 {
-	int opt, ret = 0;
+	int ret = 0;
 	char *cmd = basename(argv[0]);
 	enum display_opt display_option;
 
@@ -225,11 +225,12 @@
 		display_option = ALL;
 		if (!optc[OPT_r] && optc[OPT_u])
 			display_option = UNREGISTERED;
-		else if (optc[OPT_r] && !optc[OPT_u])
+		else if (optc[OPT_r] && !optc[OPT_u]) {
 			if (optc[OPT_a])
 				display_option = REGISTERED_WITH_UUID;
 			else if (optc[OPT_m])
 				display_option = REGISTERED_NO_UUID;
+		}
 		dm_all_monitored(display_option);
 	}
 	else if (optc[OPT_r])