[gphoto-cvs] SF.net SVN: gphoto:[12630] branches/libgphoto2-2_4/gphoto2/gphoto2/main.c

[<mar...@us...>]

Revision: 12630
          http://gphoto.svn.sourceforge.net/gphoto/?rev=12630&view=rev
Author:   marcusmeissner
Date:     2010-01-22 20:18:17 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
glob_debug is not used, use debug_option_given

Modified Paths:
--------------
    branches/libgphoto2-2_4/gphoto2/gphoto2/main.c

Modified: branches/libgphoto2-2_4/gphoto2/gphoto2/main.c
===================================================================
--- branches/libgphoto2-2_4/gphoto2/gphoto2/main.c	2010-01-22 20:17:22 UTC (rev 12629)
+++ branches/libgphoto2-2_4/gphoto2/gphoto2/main.c	2010-01-22 20:18:17 UTC (rev 12630)
@@ -81,7 +81,7 @@
 #define __unused__
 #endif
 
-static int  glob_debug = -1;
+static int  debug_option_given = 0;
 char glob_cancel = 0;
 static int  glob_frames = 0;
 static int  glob_interval = 0;
@@ -1483,7 +1483,7 @@
 
 	fprintf (stderr, _("*** Error (%i: '%s') ***       \n\n"), result,
 		gp_result_as_string (result));
-	if (glob_debug == -1) {
+	if (!debug_option_given) {
 		int n;
 		printf (_("For debugging messages, please use "
 			  "the --debug option.\n"
@@ -1567,7 +1567,6 @@
 {
 	CallbackParams cb_params;
 	poptContext ctx;
-	int debug_option_given = 0;
 	int help_option_given = 0;
 	int usage_option_given = 0;
 	char *debug_logfile_name = NULL;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.