[ 1741211 ] sfcb: cleanup compiler warnings

kkaempf · Jun 22, 2007 · 54fe561 · 54fe561
1 parent e6cff8c
commit 54fe561
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,13 @@
+2007-06-22  Tyrel Datwyler <tyreld@us.ibm.com>
+
+    * fileRepository.c, objectImpl.c, providerMgr.c, queryLexer.l,
+    queryStatement.c, support.c:
+    Fixed 1741211 cleanup compiler warnings
+
 2007-06-21  Sven Schuetz <sven@de.ibm.com>
 
 	* brokerUpc.c, internalProvider.c, providerMgr.c:
-	Fixed 1734174 sfcb behaves different when assocclass & resultclass
+	Fixed 1734174: sfcb behaves different when assocclass & resultclass
 	are unknown
 
 2007-06-20  Sven Schuetz <sven@de.ibm.com>

diff --git a/NEWS b/NEWS
@@ -28,6 +28,7 @@ Bugs fixed:
 - 1732774 Fixed random provider segfaults when using local client interface
 - 1730915 Fixed getInstance fails for associations
 - 1734174 Fixed sfcb behaves different when assocclass & resultclass unknown
+- 1741211 Fixed cleanup compiler warnings
 
 
 Changes in 1.2.2

diff --git a/fileRepository.c b/fileRepository.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fileRepository.c,v 1.13 2007/05/23 16:55:32 sschuetz Exp $
+ * $Id: fileRepository.c,v 1.14 2007/06/22 10:34:44 sschuetz Exp $
  *
  * © Copyright IBM Corp. 2005, 2007
  *
@@ -257,7 +257,7 @@ static void copy(FILE *o, FILE *i, int len, unsigned long ofs)
 static int adjust(BlobIndex *bi, int pos, int adj)
 {
    int dp=pos,l,o,sl;
-   char *p,*r,str[32];
+   char *p,*r = NULL,str[32];
    while (dp<bi->dSize) {
       memset(str,' ',sizeof(str)-1);
       str[sizeof(str)-1]=0;

diff --git a/objectImpl.c b/objectImpl.c
@@ -62,6 +62,8 @@ extern char *sfcb_pathToChars(CMPIObjectPath * cop, CMPIStatus * rc, char *str);
 extern void dump(char *msg, void *a, int l);
 extern CMPIArray *native_make_CMPIArray(CMPIData * av, CMPIStatus * rc,
                                  ClObjectHdr * hdr);
+extern int instance2xml(CMPIInstance * ci, UtilStringBuffer * sb, 
+                        unsigned int flags);
 static ClString nls = { 0 };
 static int objectSize = 0;
 

diff --git a/providerMgr.c b/providerMgr.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: providerMgr.c,v 1.42 2007/06/21 13:23:12 sschuetz Exp $
+ * $Id: providerMgr.c,v 1.43 2007/06/22 10:34:43 sschuetz Exp $
  *
  * © Copyright IBM Corp. 2005, 2007
  *
@@ -580,7 +580,7 @@ static void assocProviderList(int *requestor, OperationHdr * req)
    char *className = (char *) req->className.data;
    char *nameSpace = (char *) req->nameSpace.data;
    UtilList *providers = NULL;
-   long count;
+   long count = 0;
    ProviderInfo *info;
    int dmy = 0, rc;
    char *msg=NULL;

diff --git a/queryLexer.l b/queryLexer.l
@@ -70,6 +70,8 @@ DECIMAL_DIGIT [0-9]
 BLANK [ \t\n]
 IDENT_CHAR [A-Za-z_]
 
+%option nounput
+
 %%
 
 [Ss][Ee][Ll][Ee][Cc][Tt] {

diff --git a/queryStatement.c b/queryStatement.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: queryStatement.c,v 1.13 2007/05/02 13:53:23 sschuetz Exp $
+ * $Id: queryStatement.c,v 1.14 2007/06/22 10:34:43 sschuetz Exp $
  *
  * © Copyright IBM Corp. 2005, 2007
  *
@@ -169,11 +169,11 @@ static void qsRelease(QLStatement *st)
 }
 
 static CMPIInstance* qsCloneAndFilter(QLStatement *st, CMPIInstance *ci, CMPIObjectPath *cop, 
-         const char **kNames)
+         char **kNames)
 {
    CMPIInstance *nic=CMNewInstance(Broker,cop,NULL);
    CMPICount i,c=CMGetPropertyCount(ci,NULL);
-   CMSetPropertyFilter(nic,(const char**)st->spNames,kNames);
+   CMSetPropertyFilter(nic,(const char**)st->spNames, (const char**)kNames);
    for (i=0; i<c; i++) {
       CMPIString *name;
       CMPIData d=CMGetPropertyAt(ci,i,&name,NULL);

diff --git a/support.c b/support.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: support.c,v 1.23 2007/04/27 09:11:07 sschuetz Exp $
+ * $Id: support.c,v 1.24 2007/06/22 10:34:44 sschuetz Exp $
  *
  *  © Copyright IBM Corp. 2005, 2007
  *
@@ -865,7 +865,7 @@ char *cntlGetVal(CntlVals * rv)
 
 char *cntlGetStr(CntlVals * rv)
 {
-   char *p, *v;
+   char *v;
    if (rv->val == NULL) {
       return NULL;
    }