Commit 81d5944f authored by mskold@mysql.com's avatar mskold@mysql.com

Fixed compiler warnings

parent 4a980567
...@@ -29,7 +29,7 @@ static const char * localBlockNames[NO_OF_BLOCKS]; ...@@ -29,7 +29,7 @@ static const char * localBlockNames[NO_OF_BLOCKS];
static static
int int
initSignalNames(const char * dst[], const GsnName src[], unsigned short len){ initSignalNames(const char * dst[], const GsnName src[], unsigned short len){
int i; unsigned i;
for(i = 0; i<=MAX_GSN; i++) for(i = 0; i<=MAX_GSN; i++)
dst[i] = 0; dst[i] = 0;
...@@ -55,7 +55,7 @@ int ...@@ -55,7 +55,7 @@ int
initSignalPrinters(SignalDataPrintFunction dst[], initSignalPrinters(SignalDataPrintFunction dst[],
const NameFunctionPair src[], const NameFunctionPair src[],
unsigned short len){ unsigned short len){
int i; unsigned i;
for(i = 0; i<=MAX_GSN; i++) for(i = 0; i<=MAX_GSN; i++)
dst[i] = 0; dst[i] = 0;
...@@ -81,7 +81,7 @@ int ...@@ -81,7 +81,7 @@ int
initBlockNames(const char * dst[], initBlockNames(const char * dst[],
const BlockName src[], const BlockName src[],
unsigned len){ unsigned len){
int i; unsigned i;
for(i = 0; i<NO_OF_BLOCKS; i++) for(i = 0; i<NO_OF_BLOCKS; i++)
dst[i] = 0; dst[i] = 0;
......
...@@ -113,7 +113,7 @@ SysLogHandler::setParam(const BaseString &param, const BaseString &value) { ...@@ -113,7 +113,7 @@ SysLogHandler::setParam(const BaseString &param, const BaseString &value) {
} }
static const struct syslog_facility { static const struct syslog_facility {
char *name; const char *name;
int value; int value;
} facilitynames[] = { } facilitynames[] = {
{ "auth", LOG_AUTH }, { "auth", LOG_AUTH },
......
...@@ -39,7 +39,7 @@ Ndb_getInAddr(struct in_addr * dst, const char *address) { ...@@ -39,7 +39,7 @@ Ndb_getInAddr(struct in_addr * dst, const char *address) {
/* Try it as aaa.bbb.ccc.ddd. */ /* Try it as aaa.bbb.ccc.ddd. */
dst->s_addr = inet_addr(address); dst->s_addr = inet_addr(address);
if (dst->s_addr != -1) { if (dst->s_addr != INADDR_NONE) {
return 0; return 0;
} }
return -1; return -1;
......
...@@ -494,7 +494,7 @@ arg_match_short (struct getargs *args, size_t num_args, ...@@ -494,7 +494,7 @@ arg_match_short (struct getargs *args, size_t num_args,
optarg = &argv[j + 1]; optarg = &argv[j + 1];
else { else {
++*optind; ++*optind;
optarg = rargv[*optind]; optarg = (char *) rargv[*optind];
} }
if(optarg == NULL) { if(optarg == NULL) {
--*optind; --*optind;
...@@ -545,10 +545,10 @@ getarg(struct getargs *args, size_t num_args, ...@@ -545,10 +545,10 @@ getarg(struct getargs *args, size_t num_args,
i++; i++;
break; break;
} }
ret = arg_match_long (args, num_args, argv[i] + 2, ret = arg_match_long (args, num_args, (char *) argv[i] + 2,
argc, argv, &i); argc, argv, &i);
} else { } else {
ret = arg_match_short (args, num_args, argv[i], ret = arg_match_short (args, num_args, (char *) argv[i],
argc, argv, &i); argc, argv, &i);
} }
if(ret) if(ret)
......
...@@ -154,8 +154,8 @@ static void localRandom48(DRand48Data *buffer, long int *result) ...@@ -154,8 +154,8 @@ static void localRandom48(DRand48Data *buffer, long int *result)
static void shuffleSequence(RandomSequence *seq) static void shuffleSequence(RandomSequence *seq)
{ {
int i; unsigned int i;
int j; unsigned int j;
unsigned int tmp; unsigned int tmp;
if( !seq ) return; if( !seq ) return;
...@@ -254,7 +254,7 @@ unsigned int getNextRandom(RandomSequence *seq) ...@@ -254,7 +254,7 @@ unsigned int getNextRandom(RandomSequence *seq)
void printSequence(RandomSequence *seq, unsigned int numPerRow) void printSequence(RandomSequence *seq, unsigned int numPerRow)
{ {
int i; unsigned int i;
if( !seq ) return; if( !seq ) return;
......
...@@ -135,7 +135,7 @@ ndbSearchUpgradeCompatibleTable(Uint32 ownVersion, Uint32 otherVersion, ...@@ -135,7 +135,7 @@ ndbSearchUpgradeCompatibleTable(Uint32 ownVersion, Uint32 otherVersion,
int i; int i;
for (i = 0; table[i].ownVersion != 0 && table[i].otherVersion != 0; i++) { for (i = 0; table[i].ownVersion != 0 && table[i].otherVersion != 0; i++) {
if (table[i].ownVersion == ownVersion || if (table[i].ownVersion == ownVersion ||
table[i].ownVersion == ~0) { table[i].ownVersion == (Uint32) ~0) {
switch (table[i].matchType) { switch (table[i].matchType) {
case UG_Range: case UG_Range:
if (otherVersion >= table[i].otherVersion){ if (otherVersion >= table[i].otherVersion){
......
...@@ -230,7 +230,7 @@ NdbOut& operator<<(NdbOut& out, const NdbRecAttr &r) ...@@ -230,7 +230,7 @@ NdbOut& operator<<(NdbOut& out, const NdbRecAttr &r)
} }
break; break;
default: /* no print functions for the rest, just print type */ default: /* no print functions for the rest, just print type */
out << r.getType(); out << (int) r.getType();
j = r.arraySize(); j = r.arraySize();
if (j > 1) if (j > 1)
out << " " << j << " times"; out << " " << j << " times";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment