diff options
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/g10.c | 8 | ||||
| -rw-r--r-- | g10/keyedit.c | 3 | ||||
| -rw-r--r-- | g10/keyserver.c | 18 | ||||
| -rw-r--r-- | g10/mainproc.c | 2 | ||||
| -rw-r--r-- | g10/options.h | 4 |
6 files changed, 27 insertions, 15 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 4e217e867..40b5aab9c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2004-05-10 David Shaw <dshaw@jabberwocky.com> + + * options.h, mainproc.c (symkey_decrypt_seskey), keyserver.c + (struct keyrec, parse_keyrec, keyserver_search_prompt), keyedit.c + (keyedit_menu), g10.c (add_keyserver_url, add_policy_url): Fix + some compiler warnings. + 2004-05-08 David Shaw <dshaw@jabberwocky.com> * keyedit.c (keyedit_menu, menu_set_keyserver_url): Allow passing @@ -679,8 +679,8 @@ static ARGPARSE_OPTS opts[] = { { opcscDriver, "pcsc-driver", 2, "@"}, { oDisableCCID, "disable-ccid", 0, "@"}, -{0} }; - + {0,NULL,0,NULL} +}; int g10_errors_seen = 0; @@ -3649,7 +3649,7 @@ add_notation_data( const char *string, int which ) static void add_policy_url( const char *string, int which ) { - int i,critical=0; + unsigned int i,critical=0; STRLIST sl; if(*string=='!') @@ -3682,7 +3682,7 @@ add_policy_url( const char *string, int which ) static void add_keyserver_url( const char *string, int which ) { - int i,critical=0; + unsigned int i,critical=0; STRLIST sl; if(*string=='!') diff --git a/g10/keyedit.c b/g10/keyedit.c index 8ab2276be..9b7638b49 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1167,8 +1167,7 @@ keyedit_menu( const char *username, STRLIST locusr, { N_("disable") , cmdDISABLEKEY, 0,1, N_("disable a key") }, { N_("enable") , cmdENABLEKEY , 0,1, N_("enable a key") }, { N_("showphoto"),cmdSHOWPHOTO , 0,0, N_("show photo ID") }, - - { NULL, cmdNONE } }; + { NULL, cmdNONE, 0, 0, NULL } }; enum cmdids cmd = 0; int rc = 0; KBNODE keyblock = NULL; diff --git a/g10/keyserver.c b/g10/keyserver.c index 7cf7824e8..920270001 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -45,11 +45,11 @@ struct keyrec { KEYDB_SEARCH_DESC desc; - time_t createtime,expiretime; + u32 createtime,expiretime; int size,flags; byte type; IOBUF uidbuf; - int lines; + unsigned int lines; }; /* Tell remote processes about these options */ @@ -427,12 +427,18 @@ parse_keyrec(char *keystring) if((tok=strsep(&keystring,":"))==NULL) return ret; - work->createtime=atoi(tok); + if(atoi(tok)<0) + work->createtime=0; + else + work->createtime=atoi(tok); if((tok=strsep(&keystring,":"))==NULL) return ret; - work->expiretime=atoi(tok); + if(atoi(tok)<0) + work->expiretime=0; + else + work->expiretime=atoi(tok); if((tok=strsep(&keystring,":"))==NULL) return ret; @@ -561,8 +567,8 @@ show_prompt(KEYDB_SEARCH_DESC *desc,int numdesc,int count,const char *search) static void keyserver_search_prompt(IOBUF buffer,const char *searchstr) { - int i=0,validcount=0,started=0,header=0,count=1,numlines=0; - unsigned int maxlen,buflen; + int i=0,validcount=0,started=0,header=0,count=1; + unsigned int maxlen,buflen,numlines=0; KEYDB_SEARCH_DESC *desc; byte *line=NULL; diff --git a/g10/mainproc.c b/g10/mainproc.c index 51e399b37..db15b0b5a 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -242,7 +242,7 @@ static int symkey_decrypt_seskey( DEK *dek, byte *seskey, size_t slen ) { CIPHER_HANDLE hd; - int n; + unsigned int n; if ( slen < 17 || slen > 33 ) { log_error ( _("weird size for an encrypted session key (%d)\n"), diff --git a/g10/options.h b/g10/options.h index e050d0175..67e9a7bb9 100644 --- a/g10/options.h +++ b/g10/options.h @@ -188,8 +188,8 @@ struct int strict; int mangle_dos_filenames; int enable_progress_filter; - int screen_columns; - int screen_lines; + unsigned int screen_columns; + unsigned int screen_lines; #ifdef ENABLE_CARD_SUPPORT const char *ctapi_driver; /* Library to access the ctAPI. */ |