File 0006-Werror.patch of Package sblim-sfcb
From ab48a48bef2a5cecb35c5c72ee9b236af5f7b6cb Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 22 Oct 2008 10:32:34 +0200
Subject: [PATCH] Werror.patch
keep gcc happy even with -Werror
---
cimcClientSfcbLocal.c | 2 +-
httpAdapter.c | 2 +-
httpComm.c | 2 +-
mofc/mofparse.c | 2 +-
mofc/mofs.l | 2 +-
objectImplSwapI32toP32.c | 4 ++++
queryParser.y | 2 +-
selectcond.c | 2 +-
sfcbdumpP32onI32.c | 12 ++++++------
9 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c
index 67ad0ca..3f79540 100644
--- a/cimcClientSfcbLocal.c
+++ b/cimcClientSfcbLocal.c
@@ -29,7 +29,7 @@
#define CIMCSetStatusWithChars(st,rcp,chars) \
- { if (st) { (st)->rc=(rcp); \
+ { if (st != NULL) { (st)->rc=(rcp); \
(st)->msg=NewCMPIString((chars),NULL); }}
#define NewCMPIString sfcb_native_new_CMPIString
diff --git a/httpAdapter.c b/httpAdapter.c
index 69c8f98..8671b84 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -814,7 +814,7 @@ static int doHttpRequest(CommHndl conn_fd)
int authorized = 0;
if (!discardInput && doUdsAuth) {
struct ucred cr;
- int cl = sizeof(cr);
+ socklen_t cl = sizeof(cr);
if (getsockopt(conn_fd.socket, SOL_SOCKET, SO_PEERCRED, &cr, &cl) == 0) {
if (cr.uid == 0) {
authorized = 1;
diff --git a/httpComm.c b/httpComm.c
index 00a70a5..66aa2b5 100644
--- a/httpComm.c
+++ b/httpComm.c
@@ -122,7 +122,7 @@ void commFlush(CommHndl hndl)
#if defined USE_SSL
if (hndl.bio) {
- BIO_flush(hndl.bio);
+ (void)BIO_flush(hndl.bio);
} else
#endif
if (hndl.file) {
diff --git a/mofc/mofparse.c b/mofc/mofparse.c
index 64af1dc..af22686 100644
--- a/mofc/mofparse.c
+++ b/mofc/mofparse.c
@@ -112,7 +112,7 @@ static void version()
static void help(const char * name)
{
usage(name);
- version(name);
+ version();
printf(" Allowed options are\n");
printf(" -h display this message\n");
printf(" -v print some extra information\n");
diff --git a/mofc/mofs.l b/mofc/mofs.l
index 5eead61..ec14b31 100644
--- a/mofc/mofs.l
+++ b/mofc/mofs.l
@@ -24,7 +24,7 @@
# include <ctype.h>
# include <hash.h>
-
+#define YY_NO_INPUT
# if defined SCANDEBUG /* for debugging */
# undef YY_DECL
typedef YY_CHAR * TOKENTYPE;
diff --git a/objectImplSwapI32toP32.c b/objectImplSwapI32toP32.c
index 68d67ea..19dea1d 100644
--- a/objectImplSwapI32toP32.c
+++ b/objectImplSwapI32toP32.c
@@ -262,7 +262,11 @@ static long copyI32toP32Parameters(int ofs, char *to, CLP32_ClSection * ts,
tp->quals = bswap_16(fp->quals);
tp->parameter.type=bswap_16(fp->parameter.type);
tp->parameter.arraySize=bswap_32(fp->parameter.arraySize);
+#if __WORDSIZE == 64
+ tp->parameter.refName=(char*)bswap_64((unsigned long long)(fp->parameter.refName));
+#else
tp->parameter.refName=(void*)bswap_32((int)(fp->parameter.refName));
+#endif
if (fp->qualifiers.used)
l += copyI32toP32Qualifiers(ofs + l, to, &tp->qualifiers, from, &fp->qualifiers);
}
diff --git a/queryParser.y b/queryParser.y
index 762c1db..d9212a3 100644
--- a/queryParser.y
+++ b/queryParser.y
@@ -71,7 +71,7 @@
#define YYLEX_PARAM parm
#define YYERROR_VERBOSE 1
-extern int yylex();
+extern int yylex(void *);
extern void sfcQueryErr(char*,char*,char*);
extern void yyError(char*);
extern void yyerror(char*);
diff --git a/selectcond.c b/selectcond.c
index b31958d..421fdde 100644
--- a/selectcond.c
+++ b/selectcond.c
@@ -36,7 +36,7 @@ typedef struct native_selectcond {
int type;
} NativeSelectCond;
-static NativeSelectCond *__new_cond();
+static NativeSelectCond *__new_cond(int mode, CMPIArray *conds, int type, CMPIStatus * rc);
/*****************************************************************************/
diff --git a/sfcbdumpP32onI32.c b/sfcbdumpP32onI32.c
index fd57e3e..ec86728 100644
--- a/sfcbdumpP32onI32.c
+++ b/sfcbdumpP32onI32.c
@@ -130,7 +130,7 @@ int main(int argc, char * argv[])
} else if (bswap_32(clv.size) != sizeof(CLP32_ClVersionRecord)) {
rc = 1;
fprintf(stderr, "%s: version record size mismatch, is %d expected %d\n",
- SCHEMA_NAME, bswap_32(clv.size), sizeof(CLP32_ClVersionRecord));
+ SCHEMA_NAME, bswap_32(clv.size), (int)sizeof(CLP32_ClVersionRecord));
state = REC_QUIT;
} else {
printf("%s: Size of version record: %d, version: %hx\n",
@@ -149,7 +149,7 @@ int main(int argc, char * argv[])
} else if (bswap_32(coh.size) < sizeof(CLP32_ClObjectHdr)) {
rc = 1;
fprintf(stderr, "%s: header record size mismatch, is %d expected at least %d\n",
- SCHEMA_NAME, bswap_32(coh.size), sizeof(CLP32_ClObjectHdr));
+ SCHEMA_NAME, bswap_32(coh.size), (int)sizeof(CLP32_ClObjectHdr));
state = REC_QUIT;
} else {
printf("%s: Header size: %d, type: %hx\n",
@@ -216,8 +216,8 @@ int main(int argc, char * argv[])
if ((numRead=read(fdSchema, fillBuf+sizeof(CLP32_ClObjectHdr), numFill)) != numFill) {
rc = 1;
fprintf(stderr, "%s: structure record short, is %d expected %d\n",
- SCHEMA_NAME, numRead + sizeof(CLP32_ClObjectHdr),
- numFill + sizeof(CLP32_ClObjectHdr));
+ SCHEMA_NAME, numRead + (int)sizeof(CLP32_ClObjectHdr),
+ numFill + (int)sizeof(CLP32_ClObjectHdr));
state = REC_QUIT;
} else {
state = fillState;
@@ -381,7 +381,7 @@ static int dumpArrayBuffer(const CLP32_ClObjectHdr *hdr, const char *prefix)
for (i=0; i < bswap_16(ab->iUsed); i++) {
printf("%s ab[%3d]=(%hx,%hx,%016llx)\n",prefix,i,
bswap_16(ab->buf[bswap_32(index[i])].type), bswap_16(ab->buf[bswap_32(index[i])].state),
- bswap_64(ab->buf[bswap_32(index[i])].value.uint64));
+ (unsigned long long)bswap_64(ab->buf[bswap_32(index[i])].value.uint64));
}
}
} else {
@@ -391,7 +391,7 @@ static int dumpArrayBuffer(const CLP32_ClObjectHdr *hdr, const char *prefix)
}
} else {
fprintf(stderr,"%s invalid array buffer offset %d, must be < %d\n",
- prefix,abs(bswap_32(hdr->arrayBufOffset)),bswap_32(hdr->size) + sizeof(CLP32_ClArrayBuf));
+ prefix,abs(bswap_32(hdr->arrayBufOffset)),bswap_32(hdr->size) + (int)sizeof(CLP32_ClArrayBuf));
rc = 2;
}
return rc;
--
1.6.0.2
