diff options
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 6 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index c738b82d5..62c29d77a 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,9 @@ +2007-06-11 Werner Koch <[email protected]> + + * gpgkeys_hkp.c (send_key): Rename eof to r_eof as some Windows + header defines such a symbol. + (main): Likewise. + 2007-06-06 Werner Koch <[email protected]> * gpgkeys_ldap.c (send_key, send_key_keyserver): Rename eof to diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index e393b856c..cb86b26c0 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -93,7 +93,7 @@ append_path(char *dest,const char *src) } int -send_key(int *eof) +send_key(int *r_eof) { CURLcode res; char request[MAX_URL+15]; @@ -117,7 +117,7 @@ send_key(int *eof) { /* i.e. eof before the KEY BEGIN was found. This isn't an error. */ - *eof=1; + *r_eof=1; ret=KEYSERVER_OK; goto fail; } @@ -157,7 +157,7 @@ send_key(int *eof) if(!end) { fprintf(console,"gpgkeys: no KEY %s END found\n",keyid); - *eof=1; + *r_eof=1; ret=KEYSERVER_KEY_INCOMPLETE; goto fail; } @@ -768,16 +768,16 @@ main(int argc,char *argv[]) } else if(opt->action==KS_SEND) { - int eof=0; + int myeof=0; do { set_timeout(opt->timeout); - if(send_key(&eof)!=KEYSERVER_OK) + if(send_key(&myeof)!=KEYSERVER_OK) failed++; } - while(!eof); + while(!myeof); } else if(opt->action==KS_SEARCH) { |