gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the remaining compiler warnings.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35044 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
theraven 2012-04-07 10:45:30 +00:00
parent 4b86775102
commit 8eb15d99d8
4 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Source/GSSocketStream.m
View file

@ -80,13 +80,14 @@ GSPrivateSockaddrHost(struct sockaddr *addr)
#if defined(AF_INET6) #if defined(AF_INET6)
if (AF_INET6 == addr->sa_family) if (AF_INET6 == addr->sa_family)
{ {
struct sockaddr_in6 *addr6 = (struct sockaddr_in6*)addr; struct sockaddr_in6 *addr6 = (struct sockaddr_in6*)(void*)addr;
inet_ntop(AF_INET, &addr6->sin6_addr, buf, sizeof(buf)); inet_ntop(AF_INET, &addr6->sin6_addr, buf, sizeof(buf));
return [NSString stringWithUTF8String: buf]; return [NSString stringWithUTF8String: buf];
} }
#endif #endif
inet_ntop(AF_INET, &((struct sockaddr_in*)addr)->sin_addr, buf, sizeof(buf)); inet_ntop(AF_INET, &((struct sockaddr_in*)(void*)addr)->sin_addr,
buf, sizeof(buf));
return [NSString stringWithUTF8String: buf]; return [NSString stringWithUTF8String: buf];
} }
@ -106,14 +107,14 @@ GSPrivateSockaddrPort(struct sockaddr *addr)
#if defined(AF_INET6) #if defined(AF_INET6)
if (AF_INET6 == addr->sa_family) if (AF_INET6 == addr->sa_family)
{ {
struct sockaddr_in6 *addr6 = (struct sockaddr_in6*)addr; struct sockaddr_in6 *addr6 = (struct sockaddr_in6*)(void*)addr;
port = addr6->sin6_port; port = addr6->sin6_port;
port = GSSwapBigI16ToHost(port); port = GSSwapBigI16ToHost(port);
return port; return port;
} }
#endif #endif
port = ((struct sockaddr_in*)addr)->sin_port; port = ((struct sockaddr_in*)(void*)addr)->sin_port;
port = GSSwapBigI16ToHost(port); port = GSSwapBigI16ToHost(port);
return port; return port;
} }
@ -147,7 +148,7 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
} }
if (0 == strchr(n, ':')) if (0 == strchr(n, ':'))
{ {
struct sockaddr_in *addr = (struct sockaddr_in*)sin; struct sockaddr_in *addr = (struct sockaddr_in*)(void*)sin;
if (inet_pton(AF_INET, n, &addr->sin_addr) <= 0) if (inet_pton(AF_INET, n, &addr->sin_addr) <= 0)
{ {
@ -157,7 +158,7 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
else else
{ {
#if defined(AF_INET6) #if defined(AF_INET6)
struct sockaddr_in6 *addr6 = (struct sockaddr_in6*)sin; struct sockaddr_in6 *addr6 = (struct sockaddr_in6*)(void*)sin;
sin->sa_family = AF_INET6; sin->sa_family = AF_INET6;
if (inet_pton(AF_INET6, n, &addr6->sin6_addr) <= 0) if (inet_pton(AF_INET6, n, &addr6->sin6_addr) <= 0)
@ -171,7 +172,7 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
} }
else else
{ {
((struct sockaddr_in*)sin)->sin_addr.s_addr ((struct sockaddr_in*)(void*)sin)->sin_addr.s_addr
= GSSwapHostI32ToBig(INADDR_ANY); = GSSwapHostI32ToBig(INADDR_ANY);
} }
@ -229,11 +230,11 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
#if defined(AF_INET6) #if defined(AF_INET6)
if (AF_INET6 == sin->sa_family) if (AF_INET6 == sin->sa_family)
{ {
((struct sockaddr_in6*)sin)->sin6_port = GSSwapHostI16ToBig(port); ((struct sockaddr_in6*)(void*)sin)->sin6_port = GSSwapHostI16ToBig(port);
} }
else else
{ {
((struct sockaddr_in*)sin)->sin_port = GSSwapHostI16ToBig(port); ((struct sockaddr_in*)(void*)sin)->sin_port = GSSwapHostI16ToBig(port);
} }
#else #else
((struct sockaddr_ind*)sin)->sin6_port = GSSwapHostI16ToBig(port); ((struct sockaddr_ind*)sin)->sin6_port = GSSwapHostI16ToBig(port);
@ -347,6 +348,11 @@ GSPrivateSockaddrSetup(NSString *machine, uint16_t port,
/* Temporarily redefine 'id' in case the headers use the objc reserved word. /* Temporarily redefine 'id' in case the headers use the objc reserved word.
*/ */
#define id GNUTLSID #define id GNUTLSID
/* gcrypt uses __attribute__((deprecated)) to mark structure members that are
* private. This causes compiler warnings just from using the header. Turn
* them off...
*/
#define _GCRYPT_IN_LIBGCRYPT
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gcrypt.h> #include <gcrypt.h>
#undef id #undef id

2
Source/NSAffineTransform.m
View file

@ -668,7 +668,7 @@ static NSAffineTransformStruct identityTransform = {
else else
{ {
// FIXME // FIXME
NSLog(@"Got data %@ len %d for affine transform", d, length); NSLog(@"Got data %@ len %d for affine transform", d, (int)length);
return [self notImplemented: _cmd]; return [self notImplemented: _cmd];
} }
} }

4
Source/NSXMLDTDNode.m
View file

@ -109,9 +109,9 @@ GS_PRIVATE_INTERNAL(NSXMLDTDNode)
return StringFromXMLStringPtr(internal->node->ExternalID); return StringFromXMLStringPtr(internal->node->ExternalID);
} }
- (void) setDTDKind: (NSXMLDTDNodeKind)kind - (void) setDTDKind: (NSXMLDTDNodeKind)nodeKind
{ {
internal->DTDKind = kind; internal->DTDKind = nodeKind;
} }
- (void) setNotationName: (NSString*)notationName - (void) setNotationName: (NSString*)notationName

6
Tools/xmlparse.m
View file

@ -30,11 +30,11 @@
#import "Foundation/NSUserDefaults.h" #import "Foundation/NSUserDefaults.h"
#import "GNUstepBase/Additions.h" #import "GNUstepBase/Additions.h"
@interface GSXMLParser (Loader) @interface GSXMLParse : GSXMLParser
+ (NSString*) loadEntity: (NSString*)publicId + (NSString*) loadEntity: (NSString*)publicId
at: (NSString*)location; at: (NSString*)location;
@end @end
@implementation GSXMLParser (Loader) @implementation GSXMLParse : GSXMLParser
+ (NSString*) loadEntity: (NSString*)publicId + (NSString*) loadEntity: (NSString*)publicId
at: (NSString*)location at: (NSString*)location
{ {
@ -95,7 +95,7 @@ main(int argc, char **argv, char **env)
GSXMLNode *root; GSXMLNode *root;
GSXMLParser *parser; GSXMLParser *parser;
parser = [GSXMLParser parserWithContentsOfFile: file]; parser = [GSXMLParse parserWithContentsOfFile: file];
[parser substituteEntities: NO]; [parser substituteEntities: NO];
[parser doValidityChecking: YES]; [parser doValidityChecking: YES];
[parser keepBlanks: NO]; [parser keepBlanks: NO];