Tweaks to avoid compiler warnings

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34054 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2011-10-25 08:02:38 +00:00
parent a3ba553688
commit 1c0ad8aa26
2 changed files with 17 additions and 11 deletions

View file

@ -24,6 +24,7 @@
*/ */
#import "common.h" #import "common.h"
#import "Foundation/NSValue.h"
#import "GNUstepBase/NSURL+GNUstepBase.h" #import "GNUstepBase/NSURL+GNUstepBase.h"
@implementation NSURL (GNUstepBaseAdditions) @implementation NSURL (GNUstepBaseAdditions)

View file

@ -3090,10 +3090,7 @@ handle_request(int desc)
*/ */
if (ri->addr.sin_port == my_port) if (ri->addr.sin_port == my_port)
{ {
struct in_addr *ptr;
struct in_addr sin; struct in_addr sin;
unsigned long net;
int c;
memcpy(&sin, ri->buf.r.name, IASIZE); memcpy(&sin, ri->buf.r.name, IASIZE);
if (debug > 2) if (debug > 2)
@ -3101,6 +3098,21 @@ handle_request(int desc)
snprintf(ebuf, sizeof(ebuf), "Probe from '%s'", inet_ntoa(sin)); snprintf(ebuf, sizeof(ebuf), "Probe from '%s'", inet_ntoa(sin));
gdomap_log(LOG_DEBUG); gdomap_log(LOG_DEBUG);
} }
prb_add(&sin);
/*
* Irrespective of what we are told to do - we also add the
* interface from which this packet arrived so we have a
* route we KNOW we can use.
*/
prb_add(&ri->addr.sin_addr);
#if 0
{
struct in_addr *ptr;
unsigned long net;
int c;
#if defined(__MINGW__) #if defined(__MINGW__)
if (IN_CLASSA(sin.s_addr)) if (IN_CLASSA(sin.s_addr))
{ {
@ -3119,8 +3131,6 @@ handle_request(int desc)
#endif #endif
ptr = (struct in_addr*)&ri->buf.r.name[2*IASIZE]; ptr = (struct in_addr*)&ri->buf.r.name[2*IASIZE];
c = (ri->buf.r.nsize - 2*IASIZE)/IASIZE; c = (ri->buf.r.nsize - 2*IASIZE)/IASIZE;
prb_add(&sin);
#if 0
while (c-- > 0) while (c-- > 0)
{ {
if (debug > 2) if (debug > 2)
@ -3132,13 +3142,8 @@ handle_request(int desc)
prb_add(ptr); prb_add(ptr);
ptr++; ptr++;
} }
}
#endif #endif
/*
* Irrespective of what we are told to do - we also add the
* interface from which this packet arrived so we have a
* route we KNOW we can use.
*/
prb_add(&ri->addr.sin_addr);
} }
/* /*
* For a UDP request from another name server, we send a reply * For a UDP request from another name server, we send a reply