CVS commit by ossi:
merge Quiet, Verbose & Debug into DFlags
M +3 -3 drv_imap.c 1.14
M +6 -1 isync.h 1.47
M +16 -18 main.c 1.50
M +1 -1 sync.c 1.55
M +5 -5 util.c 1.5
--- isync/src/drv_imap.c #1.13:1.14
@@ -399,5 +399,5 @@ buffer_gets( buffer_t * b, char **s )
b->buf[b->offset] = 0; /* terminate the string
*/
b->offset += 2; /* next line */
- if (Verbose)
+ if (DFlags & VERBOSE)
puts( *s );
return 0;
@@ -434,5 +434,5 @@ v_issue_imap_cmd( imap_store_t *ctx, str
"%d %s{%d+}\r\n" : "%d %s{%d}\r\n" : "%d %s\r\n",
cmd->tag, cmd->cmd, cmd->cb.dlen );
- if (Verbose) {
+ if (DFlags & VERBOSE) {
if (imap->num_in_progress)
printf( "(%d in progress) ", imap->num_in_progress );
@@ -1174,5 +1174,5 @@ do_cram_auth (imap_store_t *ctx, struct
resp = cram( prompt, srvc->user, srvc->pass );
- if (Verbose)
+ if (DFlags & VERBOSE)
printf( ">+> %s\n", resp );
l = strlen( resp );
--- isync/src/isync.h #1.46:1.47
@@ -193,5 +193,10 @@ extern const char *Home;
/* util.c */
-extern int Verbose, Quiet, Debug;
+#define DEBUG 1
+#define VERBOSE 2
+#define QUIET 4
+#define VERYQUIET 8
+
+extern int DFlags;
void debug( const char *, ... );
--- isync/src/main.c #1.49:1.50
@@ -204,15 +204,14 @@ main( int argc, char **argv )
else if (!strcmp( opt, "version" ))
version();
- else if (!strcmp( opt, "quiet" ))
- Quiet++;
- else if (!strcmp( opt, "verbose" )) {
- Verbose = 1;
- if (!Quiet)
- Quiet = 1;
- } else if (!strcmp( opt, "debug" )) {
- Debug = 1;
- if (!Quiet)
- Quiet = 1;
- } else if (!strcmp( opt, "pull" ))
+ else if (!strcmp( opt, "quiet" )) {
+ if (DFlags & QUIET)
+ DFlags |= VERYQUIET;
+ else
+ DFlags |= QUIET;
+ } else if (!strcmp( opt, "verbose" ))
+ DFlags |= VERBOSE | QUIET;
+ else if (!strcmp( opt, "debug" ))
+ DFlags |= DEBUG | QUIET;
+ else if (!strcmp( opt, "pull" ))
cops |= XOP_PULL, ops[M] |=
XOP_HAVE_TYPE;
else if (!strcmp( opt, "push" ))
@@ -363,15 +362,14 @@ main( int argc, char **argv )
goto cac;
case 'q':
- Quiet++;
+ if (DFlags & QUIET)
+ DFlags |= VERYQUIET;
+ else
+ DFlags |= QUIET;
break;
case 'V':
- Verbose = 1;
- if (!Quiet)
- Quiet = 1;
+ DFlags |= VERBOSE | QUIET;
break;
case 'D':
- Debug = 1;
- if (!Quiet)
- Quiet = 1;
+ DFlags |= DEBUG | QUIET;
break;
case 'v':
--- isync/src/sync.c #1.54:1.55
@@ -103,5 +103,5 @@ findmsgs( sync_rec_t *srecs, store_t *ct
for (msg = ctx[t]->msgs; msg; msg = msg->next) {
uid = msg->uid;
- if (Debug) {
+ if (DFlags & DEBUG) {
make_flags( msg->flags, fbuf );
printf( ctx[t]->opts & OPEN_SIZE ? " message %5d,
%-4s, %6d: " : " message %5d, %-4s: ", uid, fbuf, msg->size );
--- isync/src/util.c #1.4:1.5
@@ -31,5 +31,5 @@
#include <ctype.h>
-int Verbose, Quiet, Debug;
+int DFlags;
void
@@ -38,5 +38,5 @@ debug( const char *msg, ... )
va_list va;
- if (Debug) {
+ if (DFlags & DEBUG) {
va_start( va, msg );
vprintf( msg, va );
@@ -51,5 +51,5 @@ info( const char *msg, ... )
va_list va;
- if (!Quiet) {
+ if (!(DFlags & QUIET)) {
va_start( va, msg );
vprintf( msg, va );
@@ -62,5 +62,5 @@ void
infoc( char c )
{
- if (!Quiet) {
+ if (!(DFlags & QUIET)) {
putchar( c );
fflush( stdout );
@@ -73,5 +73,5 @@ warn( const char *msg, ... )
va_list va;
- if (Quiet < 2) {
+ if (!(DFlags & VERYQUIET)) {
va_start( va, msg );
vfprintf( stderr, msg, va );
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
isync-devel mailing list
isync-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/isync-devel
