Menu
▾
▴
[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-361-g38bf26a
|
From: Chris B. <buc...@us...> - 2013-01-10 20:28:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".
The branch, master has been updated
via 38bf26a628d57814265d87468b060e7f6843036c (commit)
via a18b0bdbe0fc04a68285dfd94ea60ea55fa219aa (commit)
via 7d50a4b7a6718fb997cc502f0d559c6014414782 (commit)
from b3e37b718ae13e86c203dec3f43c974d02efc476 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 38bf26a628d57814265d87468b060e7f6843036c
Merge: a18b0bd b3e37b7
Author: buccella <buc...@li...>
Date: Thu Jan 10 15:27:20 2013 -0500
Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcb
commit a18b0bdbe0fc04a68285dfd94ea60ea55fa219aa
Author: buccella <buc...@li...>
Date: Thu Jan 10 15:27:06 2013 -0500
[ 3600283 ] Fixup compiler warnings from gcc 4.7
commit 7d50a4b7a6718fb997cc502f0d559c6014414782
Author: buccella <buc...@li...>
Date: Thu Jan 10 14:21:49 2013 -0500
[ 3600283 ] Fixup compiler warnings from gcc 4.7
-----------------------------------------------------------------------
Summary of changes:
diff --git a/NEWS b/NEWS
index b6d4eab..d26031e 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Bugs fixed:
- 3599526 segfault during ecn with classProviderSf
- 3599329 dlopen failed for sfcbCustomLib
- 3600125 Share client tracing shm segment
+- 3600283 Fixup compiler warnings from gcc 4.7
Changes in 1.4.3
================
diff --git a/cimRequest.c b/cimRequest.c
index 8fc52fd..8220aef 100644
--- a/cimRequest.c
+++ b/cimRequest.c
@@ -480,7 +480,6 @@ genEnumResponses(BinRequestContext * binCtx,
CMPIArray *ar;
UtilStringBuffer *sb;
CMPIEnumeration *enm;
- CMPIStatus rc;
_SFCB_ENTER(TRACE_CIMXMLPROC, "genEnumResponses");
@@ -496,7 +495,7 @@ genEnumResponses(BinRequestContext * binCtx,
object = relocateSerializedConstClass(resp[i]->object[j].data);
}
- rc = arraySetElementNotTrackedAt(ar, c, (CMPIValue *) & object,
+ arraySetElementNotTrackedAt(ar, c, (CMPIValue *) & object,
binCtx->type);
}
}
@@ -572,7 +571,6 @@ genQualifierResponses(BinRequestContext * binCtx, BinResponseHdr * resp)
int j;
CMPIEnumeration *enm;
void *object;
- CMPIStatus rc;
void *genheap;
_SFCB_ENTER(TRACE_CIMXMLPROC, "genQualifierResponses");
@@ -581,7 +579,7 @@ genQualifierResponses(BinRequestContext * binCtx, BinResponseHdr * resp)
for (j = 0; j < resp->count; j++) {
object = relocateSerializedQualifier(resp->object[j].data);
- rc = arraySetElementNotTrackedAt(ar, j, (CMPIValue *) & object,
+ arraySetElementNotTrackedAt(ar, j, (CMPIValue *) & object,
binCtx->type);
}
diff --git a/cimRsRequest.c b/cimRsRequest.c
index 707abc2..5a3af30 100644
--- a/cimRsRequest.c
+++ b/cimRsRequest.c
@@ -415,14 +415,10 @@ stringsort(const void *p1, const void *p2)
void getSortedKeys(CimRsReq *rsReq)
{
- CMPIObjectPath *op;
- CMPIStatus rc;
CMPIArray *klist;
char ** keyNames;
//int i,keyCount=0;
int i;
- // Get a const class object
- op = NewCMPIObjectPath(rsReq->ns, rsReq->cn,&rc);
CMPIConstClass *cc = getConstClass(rsReq->ns,rsReq->cn);
// Get the key list and count
klist = cc->ft->getKeyList(cc);
diff --git a/cimXmlOps.y b/cimXmlOps.y
index 5a648fa..3881c84 100644
--- a/cimXmlOps.y
+++ b/cimXmlOps.y
@@ -70,7 +70,7 @@ extern int noChunking;
-extern int yyerror(char*);
+extern int yyerror(const char*);
extern int yylex (void *lvalp, ParserControl *parm);
//extern MsgSegment setInstanceMsgSegment(const CMPIInstance *ci);
@@ -602,8 +602,7 @@ buildCreateClassRequest(void *parm)
for (m = ms->first; m; m = m->next) {
ClMethod *meth;
ClParameter *cl_parm;
- int methId,
- parmId;
+ int methId;
methId = ClClassAddMethod(cl, m->name, m->type);
meth =
@@ -628,7 +627,7 @@ buildCreateClassRequest(void *parm)
pa.type = r->type;
pa.arraySize = (unsigned int) r->arraySize;
pa.refName = r->refClass;
- parmId = ClClassAddMethParameter(&cl->hdr, meth, r->name, pa);
+ ClClassAddMethParameter(&cl->hdr, meth, r->name, pa);
cl_parm = ((ClParameter *)
ClObjectGetClSection(&cl->hdr,
&meth->parameters)) + methId - 1;
diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c
index 495addc..56645aa 100644
--- a/cimcClientSfcbLocal.c
+++ b/cimcClientSfcbLocal.c
@@ -32,8 +32,8 @@
#include "queryOperation.h"
#define CIMCSetStatusWithChars(st,rcp,chars) \
- { if (st != NULL) { (st)->rc=(rcp); \
- (st)->msg=NewCMPIString((chars),NULL); }}
+ { (st)->rc=(rcp); \
+ (st)->msg=NewCMPIString((chars),NULL); }
//#define NewCMPIString sfcb_native_new_CMPIString
@@ -163,8 +163,6 @@ cloneClient(Client * cl, CMPIStatus *st)
CMPIStatus rc;
CIMCSetStatusWithChars(&rc, CMPI_RC_ERR_NOT_SUPPORTED,
"Clone function not supported");
- if (st)
- *st = rc;
return NULL;
}
@@ -233,7 +231,6 @@ cpyEnumResponses(BinRequestContext * binCtx,
CMPIArray *ar,
*art;
CMPIEnumeration *enm;
- CMPIStatus rc;
_SFCB_ENTER(TRACE_CIMXMLPROC, "genEnumResponses");
@@ -251,8 +248,8 @@ cpyEnumResponses(BinRequestContext * binCtx,
object.cls = relocateSerializedConstClass(resp[i]->object[j].data);
}
// object.inst=CMClone(object.inst,NULL);
- rc = CMSetArrayElementAt(ar, c, (CMPIValue *) & object.inst,
- binCtx->type);
+ CMSetArrayElementAt(ar, c, (CMPIValue *) & object.inst,
+ binCtx->type);
}
}
@@ -802,7 +799,8 @@ execQuery(Client * mb,
qs = parseQuery(MEM_TRACKED, query, lang, NULL, NULL, &irc);
if (irc) {
- CIMCSetStatusWithChars(rc, CMPI_RC_ERR_INVALID_QUERY,
+ if (rc)
+ CIMCSetStatusWithChars(rc, CMPI_RC_ERR_INVALID_QUERY,
"syntax error in query.");
_SFCB_RETURN(NULL);
}
@@ -810,7 +808,8 @@ execQuery(Client * mb,
fCls = qs->ft->getFromClassList(qs);
if (fCls == NULL || *fCls == NULL) {
mlogf(M_ERROR, M_SHOW, "--- from clause missing\n");
- CIMCSetStatusWithChars(rc, CMPI_RC_ERR_INVALID_QUERY,
+ if (rc)
+ CIMCSetStatusWithChars(rc, CMPI_RC_ERR_INVALID_QUERY,
"required from clause is missing.");
_SFCB_RETURN(NULL);
}
diff --git a/classProvider.c b/classProvider.c
index 8f3923e..87340a6 100644
--- a/classProvider.c
+++ b/classProvider.c
@@ -737,8 +737,7 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
ClassBase *cb;
HashTableIterator *it;
char *key;
- int rc,
- n;
+ int rc;
CMPIConstClass *cls;
CMPIObjectPath *op;
ClassRegister *cReg;
@@ -768,7 +767,6 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
cn = NULL;
if (cn == NULL) {
- n = 0;
for (it = cb->ht->ft->getFirst(cb->ht, (void **) &key, (void **) &cls);
key && it && cls;
it =
diff --git a/classProviderGz.c b/classProviderGz.c
index fe154db..f45ebe0 100644
--- a/classProviderGz.c
+++ b/classProviderGz.c
@@ -34,7 +34,7 @@ struct _ClassRegister {
int assocs,
topAssocs;
char *fn;
- gzFile *f;
+ gzFile f;
};
typedef struct _ClassRegister ClassRegister;
@@ -184,7 +184,6 @@ getFirstClass(ClassRegister * cr, char **cn, CMPIConstClass ** cls,
CMPIConstClass *cc;
ClassBase *cb = (ClassBase *) cr->hdl;
ClassRecord *crec;
- int r;
Iterator i =
cb->ht->ft->getFirst(cb->ht, (void **) cn, (void **) &crec);
@@ -198,10 +197,10 @@ getFirstClass(ClassRegister * cr, char **cn, CMPIConstClass ** cls,
}
*id = NULL;
- r = gzseek(cr->f, crec->position, SEEK_SET);
+ gzseek(cr->f, crec->position, SEEK_SET);
buf = (char *) malloc(crec->length);
- r = gzread(cr->f, buf, crec->length);
+ gzread(cr->f, buf, crec->length);
cc = NEW(CMPIConstClass);
cc->hdl = buf;
@@ -219,7 +218,6 @@ getNextClass(ClassRegister * cr, Iterator ip, char **cn,
CMPIConstClass *cc;
ClassBase *cb = (ClassBase *) cr->hdl;
ClassRecord *crec;
- int r;
Iterator i =
cb->ht->ft->getNext(cb->ht, ip, (void **) cn, (void **) &crec);
@@ -233,10 +231,10 @@ getNextClass(ClassRegister * cr, Iterator ip, char **cn,
}
*id = NULL;
- r = gzseek(cr->f, crec->position, SEEK_SET);
+ gzseek(cr->f, crec->position, SEEK_SET);
buf = (char *) malloc(crec->length);
- r = gzread(cr->f, buf, crec->length);
+ gzread(cr->f, buf, crec->length);
cc = NEW(CMPIConstClass);
cc->hdl = buf;
@@ -558,7 +556,6 @@ static CMPIConstClass *
getClass(ClassRegister * cr, const char *clsName)
{
ClassRecord *crec;
- int r;
CMPIConstClass *cc;
char *buf;
@@ -573,9 +570,9 @@ getClass(ClassRegister * cr, const char *clsName)
if (crec->cachedCls == NULL) {
// fprintf(stderr,"--- reading class %s\n",clsName);
- r = gzseek(cr->f, crec->position, SEEK_SET);
+ gzseek(cr->f, crec->position, SEEK_SET);
buf = (char *) malloc(crec->length);
- r = gzread(cr->f, buf, crec->length);
+ gzread(cr->f, buf, crec->length);
cc = NEW(CMPIConstClass);
cc->hdl = buf;
@@ -675,11 +672,9 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
char *cn = NULL;
CMPIFlags flgs = 0;
CMPIString *cni;
- ClassBase *cb;
Iterator it;
char *key;
- int rc,
- n;
+ int rc;
ClassRecord *crec;
CMPIObjectPath *op;
ClassRegister *cReg;
@@ -701,7 +696,6 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
if (cn && *cn == 0)
cn = NULL;
}
- cb = (ClassBase *) cReg->hdl;
cReg->ft->wLock(cReg);
@@ -709,7 +703,6 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
cn = NULL;
if (cn == NULL) {
- n = 0;
for (it = cReg->ft->getFirstClassRecord(cReg, &key, &crec);
key && it && crec;
it = cReg->ft->getNextClassRecord(cReg, it, &key, &crec)) {
@@ -770,7 +763,6 @@ ClassProviderEnumClasses(CMPIClassMI * mi,
char *cn = NULL;
CMPIFlags flgs = 0;
CMPIString *cni;
- ClassBase *cb;
Iterator it;
char *key;
int rc;
@@ -795,7 +787,6 @@ ClassProviderEnumClasses(CMPIClassMI * mi,
if (cn && *cn == 0)
cn = NULL;
}
- cb = (ClassBase *) cReg->hdl;
if (cn == NULL) {
for (it = cReg->ft->getFirstClass(cReg, &key, &cls, &cid);
diff --git a/classProviderMem.c b/classProviderMem.c
index 86a620a..f0d393e 100644
--- a/classProviderMem.c
+++ b/classProviderMem.c
@@ -558,8 +558,7 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
ClassBase *cb;
HashTableIterator *it;
char *key;
- int rc,
- n;
+ int rc;
CMPIConstClass *cls;
CMPIObjectPath *op;
ClassRegister *cReg;
@@ -589,7 +588,6 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
cn = NULL;
if (cn == NULL) {
- n = 0;
for (it = cb->ht->ft->getFirst(cb->ht, (void **) &key, (void **) &cls);
key && it && cls;
it =
diff --git a/classProviderSf.c b/classProviderSf.c
index b899c31..45978ce 100644
--- a/classProviderSf.c
+++ b/classProviderSf.c
@@ -43,7 +43,7 @@ struct _ClassRegister {
int assocs,
topAssocs;
char *fn;
- gzFile *f;
+ gzFile f;
};
typedef struct _ClassRegister ClassRegister;
@@ -797,7 +797,6 @@ static CMPIConstClass *
getClass(ClassRegister * cr, const char *clsName, ReadCtl *ctl)
{
ClassRecord *crec;
- int r;
CMPIConstClass *cc;
char *buf;
@@ -812,9 +811,9 @@ getClass(ClassRegister * cr, const char *clsName, ReadCtl *ctl)
/* class is not cached */
if (crec->cachedCCls == NULL) {
- r = gzseek(cr->f, crec->position, SEEK_SET);
+ gzseek(cr->f, crec->position, SEEK_SET);
buf = (char *) malloc(crec->length);
- r = gzread(cr->f, buf, crec->length);
+ gzread(cr->f, buf, crec->length);
cc = NEW(CMPIConstClass);
cc->hdl = buf;
@@ -1022,11 +1021,9 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
char *cn = NULL;
CMPIFlags flgs = 0;
CMPIString *cni;
- ClassBase *cb;
Iterator it;
char *key;
- int rc,
- n;
+ int rc;
ClassRecord *crec;
CMPIObjectPath *op;
ClassRegister *cReg;
@@ -1048,7 +1045,6 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
if (cn && *cn == 0)
cn = NULL;
}
- cb = (ClassBase *) cReg->hdl;
cReg->ft->wLock(cReg);
@@ -1056,7 +1052,6 @@ ClassProviderEnumClassNames(CMPIClassMI * mi,
cn = NULL;
if (cn == NULL) {
- n = 0;
for (it = cReg->ft->getFirstClassRecord(cReg, &key, &crec);
key && it && crec;
it = cReg->ft->getNextClassRecord(cReg, it, &key, &crec)) {
@@ -1125,7 +1120,6 @@ ClassProviderEnumClasses(CMPIClassMI * mi,
char *cn = NULL;
CMPIFlags flgs = 0;
CMPIString *cni;
- ClassBase *cb;
Iterator it;
char *key;
int rc;
@@ -1151,7 +1145,6 @@ ClassProviderEnumClasses(CMPIClassMI * mi,
if (cn && *cn == 0)
cn = NULL;
}
- cb = (ClassBase *) cReg->hdl;
if (cn == NULL) {
for (it = cReg->ft->getFirstClassRecord(cReg, &key, &crec);
diff --git a/classSchema2c.c b/classSchema2c.c
index dce30c7..e09ecef 100644
--- a/classSchema2c.c
+++ b/classSchema2c.c
@@ -102,8 +102,7 @@ static void
buildClassSource(ClassRegister * cr, char *ns)
{
ClassBase *cb = (ClassBase *) (cr + 1);
- UtilHashTable *ct = cb->ht,
- *it;
+ UtilHashTable *ct = cb->ht;
HashTableIterator *i;
char *cn;
CMPIConstClass *cc;
@@ -112,9 +111,9 @@ buildClassSource(ClassRegister * cr, char *ns)
int j;
int size;
- it = cb->it = UtilFactory->newHashTable(61,
- UtilHashTable_charKey |
- UtilHashTable_ignoreKeyCase);
+ cb->it = UtilFactory->newHashTable(61,
+ UtilHashTable_charKey |
+ UtilHashTable_ignoreKeyCase);
fprintf(stdout, "\n#include \"classSchemaMem.h\"\n\n");
fprintf(stdout, "\n#include <stddef.h>\n\n");
diff --git a/fileRepository.c b/fileRepository.c
index 832e510..2bda01a 100644
--- a/fileRepository.c
+++ b/fileRepository.c
@@ -412,7 +412,6 @@ rebuild(BlobIndex * bi, const char *id, void *blob, int blen)
xt = 0,
dt = 0,
rc = 0;
- unsigned long pos;
char *xn = alloca(strlen(bi->dir) + 8);
char *dn = alloca(strlen(bi->dir) + 8);
FILE *x,
@@ -432,7 +431,7 @@ rebuild(BlobIndex * bi, const char *id, void *blob, int blen)
if (len)
copy(d, bi->fd, bi->dlen - (bi->bofs + bi->blen), bi->bofs + bi->blen);
dt += len;
- pos = ftell(d);
+ //pos = ftell(d);
if (blen)
rc = fwrite(blob,blen,1,d) - 1;
dt += blen;
diff --git a/httpAdapter.c b/httpAdapter.c
index 509370f..e7382f7 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -1296,7 +1296,7 @@ handleHttpRequest(int connFd, int sslMode)
CommHndl conn_fd;
int isReady;
fd_set httpfds;
- struct sembuf procReleaseUnDo = { 0, 1, SEM_UNDO };
+ // struct sembuf procReleaseUnDo = { 0, 1, SEM_UNDO };
struct timeval httpTimeout;
int breakloop;
@@ -1310,7 +1310,7 @@ handleHttpRequest(int connFd, int sslMode)
for (httpProcIdX = 0; httpProcIdX < hMax; httpProcIdX++)
if (semGetValue(httpProcSem, httpProcIdX + 1) == 0)
break;
- procReleaseUnDo.sem_num = httpProcIdX + 1;
+ // procReleaseUnDo.sem_num = httpProcIdX + 1;
sessionId++;
r = fork();
@@ -1930,7 +1930,7 @@ httpDaemon(int argc, char *argv[], int sslMode, char *ipAddr,
struct sockaddr_in httpSin;
#endif
- socklen_t httpSin_len;
+ socklen_t httpSin_len = 0;
int i,
rc;
char *cp;
@@ -2249,10 +2249,9 @@ get_cert(int preverify_ok, X509_STORE_CTX * x509_ctx)
_SFCB_ENTER(TRACE_HTTPDAEMON, "get_cert");
char buf[256];
- int err, depth;
+ int depth;
x509 = X509_STORE_CTX_get_current_cert(x509_ctx);
- err = X509_STORE_CTX_get_error(x509_ctx);
depth = X509_STORE_CTX_get_error_depth(x509_ctx);
_SFCB_TRACE(2, ("--- Verify peer certificate chain: level %d:", depth));
@@ -2305,7 +2304,7 @@ ccValidate(X509 * certificate, char **principal, int mode)
static int
load_cert(const char *cert_file)
{
- STACK_OF(x509_NAME) *cert_names;
+ STACK_OF(X509_NAME) *cert_names;
if (cert_file == NULL) {
mlogf(M_ERROR, M_SHOW,
diff --git a/indCIMXMLExport.c b/indCIMXMLExport.c
index b628b65..60f7208 100644
--- a/indCIMXMLExport.c
+++ b/indCIMXMLExport.c
@@ -183,6 +183,7 @@ genRequest(CurlData * cd, char *url, char **msg)
*/
rv = curl_easy_setopt(cd->mHandle, CURLOPT_POST, 1);
+
/*
* Enable endpoint cert verification as required
*/
@@ -266,6 +267,11 @@ genRequest(CurlData * cd, char *url, char **msg)
if (curldebug && strcasecmp(curldebug,"false"))
rv = curl_easy_setopt(cd->mHandle, CURLOPT_VERBOSE, 1);
+ if (rv) {
+ *msg = strdup("Some curl opts failed during setup");
+ return 2;
+ }
+
return 0;
}
diff --git a/indCIMXMLHandler.c b/indCIMXMLHandler.c
index 1b38632..9f9e602 100644
--- a/indCIMXMLHandler.c
+++ b/indCIMXMLHandler.c
@@ -320,7 +320,6 @@ IndCIMXMLHandlerCreateInstance(CMPIInstanceMI * mi,
CMPIArgs *in,
*out = NULL;
CMPIObjectPath *op;
- CMPIData rv;
unsigned short persistenceType;
_SFCB_ENTER(TRACE_INDPROVIDER, "IndCIMXMLHandlerCreateInstance");
@@ -433,13 +432,13 @@ IndCIMXMLHandlerCreateInstance(CMPIInstanceMI * mi,
CMAddArg(in, "key", &copLocal, CMPI_ref);
op = CMNewObjectPath(_broker, "root/interop",
"cim_indicationsubscription", &st);
- rv = CBInvokeMethod(_broker, ctx, op, "_addHandler", in, out, &st);
+ CBInvokeMethod(_broker, ctx, op, "_addHandler", in, out, &st);
if (st.rc == CMPI_RC_OK) {
st = InternalProviderCreateInstance(NULL, ctx, rslt, copLocal, ciLocal);
}
else {
- rv=CBInvokeMethod(_broker,ctx,op,"_removeHandler",in,out,NULL);
+ CBInvokeMethod(_broker,ctx,op,"_removeHandler",in,out,NULL);
}
_SFCB_RETURN(st);
@@ -460,7 +459,6 @@ IndCIMXMLHandlerModifyInstance(CMPIInstanceMI * mi,
CMPIString *cn = CMGetClassName(cop, NULL);
const char *cns = cn->ft->getCharPtr(cn,NULL);
CMPIArgs *in;
- CMPIData rv;
_SFCB_ENTER(TRACE_INDPROVIDER, "IndCIMXMLHandlerModifyInstance");
@@ -480,13 +478,13 @@ IndCIMXMLHandlerModifyInstance(CMPIInstanceMI * mi,
CMAddArg(in,"key",&cop,CMPI_ref);
/* cn needs to be IndicationSub to route the IM call to interopProv */
CMPIObjectPath* sop=CMNewObjectPath(_broker,"root/interop","cim_indicationsubscription",&st);
- rv = CBInvokeMethod(_broker,ctx,sop,"_updateHandler",in,NULL,&st);
+ CBInvokeMethod(_broker,ctx,sop,"_updateHandler",in,NULL,&st);
if (st.rc==CMPI_RC_OK) {
st=InternalProviderModifyInstance(NULL,ctx,rslt,cop,ci,properties);
}
else {
- rv=CBInvokeMethod(_broker,ctx,sop,"_removeHandler",in,NULL,NULL);
+ CBInvokeMethod(_broker,ctx,sop,"_removeHandler",in,NULL,NULL);
}
}
@@ -504,7 +502,6 @@ IndCIMXMLHandlerDeleteInstance(CMPIInstanceMI * mi,
CMPIArgs *in,
*out = NULL;
CMPIObjectPath *op;
- CMPIData rv;
_SFCB_ENTER(TRACE_INDPROVIDER, "IndCIMXMLHandlerDeleteInstance");
@@ -519,7 +516,7 @@ IndCIMXMLHandlerDeleteInstance(CMPIInstanceMI * mi,
CMAddArg(in, "key", &cop, CMPI_ref);
op = CMNewObjectPath(_broker, "root/interop",
"cim_indicationsubscription", &st);
- rv = CBInvokeMethod(_broker, ctx, op, "_removeHandler", in, out, &st);
+ CBInvokeMethod(_broker, ctx, op, "_removeHandler", in, out, &st);
if (st.rc == CMPI_RC_OK) {
st = InternalProviderDeleteInstance(NULL, ctx, rslt, cop);
@@ -578,12 +575,11 @@ IndCIMXMLHandlerMethodCleanup(CMPIMethodMI * mi,
* the target destination
*/
-CMPIStatus
+int
deliverInd(const CMPIObjectPath * ref, const CMPIArgs * in, CMPIInstance * ind)
{
_SFCB_ENTER(TRACE_INDPROVIDER, "deliverInd");
- CMPIInstance *hci,
- *sub;
+ CMPIInstance *hci;
CMPIStatus st = { CMPI_RC_OK, NULL };
CMPIString *dest;
char strId[64];
@@ -595,21 +591,16 @@ deliverInd(const CMPIObjectPath * ref, const CMPIArgs * in, CMPIInstance * ind)
int rc = 0;
if ((hci = internalProviderGetInstance(ref, &st)) == NULL) {
- setStatus(&st, CMPI_RC_ERR_NOT_FOUND, NULL);
- _SFCB_RETURN(st);
+ _SFCB_RETURN(1);
}
dest = CMGetProperty(hci, "destination", NULL).value.string;
_SFCB_TRACE(1, ("--- destination: %s\n", (char *) dest->hdl));
- sub = CMGetArg(in, "subscription", NULL).value.inst;
sprintf(strId, "%d", id++);
xs = exportIndicationReq(ind, strId);
sb = segments2stringBuffer(xs.segments);
rc = exportIndication((char*)dest->hdl,
(char*)sb->ft->getCharPtr(sb), &resp, &msg);
- if (rc != 0) {
- setStatus(&st,rc,NULL);
- }
RespSegment rs = xs.segments[5];
UtilStringBuffer *usb = (UtilStringBuffer *) rs.txt;
CMRelease(usb);
@@ -618,7 +609,7 @@ deliverInd(const CMPIObjectPath * ref, const CMPIArgs * in, CMPIInstance * ind)
free(resp);
if (msg)
free(msg);
- _SFCB_RETURN(st);
+ _SFCB_RETURN(rc);
}
// Retry queue element and control vars
@@ -782,6 +773,7 @@ retryExport(void *lctx)
sigaction(SIGUSR2, &sa, NULL);
CMPIStatus st = { CMPI_RC_OK, NULL };
+ int rc = 0;
ctxLocal = prepareUpcall(ctx);
@@ -841,11 +833,11 @@ retryExport(void *lctx)
if(retryShutdown) break; // Provider shutdown
pthread_mutex_lock(&RQlock);
}
- st = deliverInd(ref, in, iinst);
- if ((st.rc == 0) || (cur->count >= maxcount - 1)) {
+ rc = deliverInd(ref, in, iinst);
+ if ((rc == 0) || (cur->count >= maxcount - 1)) {
// either it worked, or we maxed out on retries
// If it succeeded, clear the failtime
- if (st.rc == 0) {
+ if (rc == 0) {
_SFCB_TRACE(1,("--- Indication succeeded."));
sfc = 0;
CMSetProperty(sub, "DeliveryFailureTime", &sfc, CMPI_uint64);
@@ -985,6 +977,7 @@ IndCIMXMLHandlerInvokeMethod(CMPIMethodMI * mi,
CMPIStatus st = { CMPI_RC_OK, NULL };
CMPIStatus circ = { CMPI_RC_OK, NULL };
+ int drc = 0;
struct timeval tv;
struct timezone tz;
static unsigned int indID=1;
@@ -1056,9 +1049,9 @@ IndCIMXMLHandlerInvokeMethod(CMPIMethodMI * mi,
}
// Now send the indication
- st = deliverInd(ref, in, ind);
+ drc = deliverInd(ref, in, ind);
- switch (st.rc) {
+ switch (drc) {
case 0: /* Success */
case 400: /* Bad Request XML */
case 501: /* Not Implemented */
diff --git a/internalProvider.c b/internalProvider.c
index 039d363..a891842 100644
--- a/internalProvider.c
+++ b/internalProvider.c
@@ -183,7 +183,6 @@ InternalProviderEnumInstanceNames(CMPIInstanceMI * mi,
*out;
CMPIObjectPath *op;
CMPIArray *ar;
- CMPIData rv;
_SFCB_ENTER(TRACE_INTERNALPROVIDER, "InternalProviderEnumInstanceNames");
_SFCB_TRACE(1, ("%s %s", nss, cns));
@@ -192,7 +191,7 @@ InternalProviderEnumInstanceNames(CMPIInstanceMI * mi,
out = CMNewArgs(Broker, NULL);
CMAddArg(in, "class", cns, CMPI_chars);
op = CMNewObjectPath(Broker, nss, "$ClassProvider$", &sti);
- rv = CBInvokeMethod(Broker, ctx, op, "getallchildren", in, out, &sti);
+ CBInvokeMethod(Broker, ctx, op, "getallchildren", in, out, &sti);
ar = CMGetArg(out, "children", NULL).value.array;
if (ar)
ac = CMGetArrayCount(ar, NULL);
@@ -254,7 +253,6 @@ enumInstances(CMPIInstanceMI * mi,
*out;
CMPIObjectPath *op;
CMPIArray *ar;
- CMPIData rv;
_SFCB_ENTER(TRACE_INTERNALPROVIDER, "enumInstances");
_SFCB_TRACE(1, ("--- %s %s", nss, cns));
@@ -268,7 +266,7 @@ enumInstances(CMPIInstanceMI * mi,
op = CMNewObjectPath(Broker, nss, "$ClassProvider$", &sti);
_SFCB_TRACE(1, ("--- getallchildren"));
- rv = CBInvokeMethod(Broker, ctx, op, "getallchildren", in, out, &sti);
+ CBInvokeMethod(Broker, ctx, op, "getallchildren", in, out, &sti);
_SFCB_TRACE(1, ("--- getallchildren rc: %d", sti.rc));
ar = CMGetArg(out, "children", NULL).value.array;
@@ -628,12 +626,11 @@ getRefs(const CMPIContext *ctx, const CMPIResult *rslt,
}
else {
- CMPIData rv;
CMPIObjectPath *op =
CMNewObjectPath(Broker, ns, "$ClassProvider$", &st);
CMPIArgs *in = CMNewArgs(Broker, NULL);
CMPIArgs *out = CMNewArgs(Broker, NULL);
- rv = CBInvokeMethod(Broker, ctx, op, "getassocs", in, out, &st);
+ CBInvokeMethod(Broker, ctx, op, "getassocs", in, out, &st);
if (out) {
int i,
m;
diff --git a/interopProvider.c b/interopProvider.c
index 771d36e..fca1c36 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -911,9 +911,7 @@ initInterOp(const CMPIBroker * broker, const CMPIContext *ctx)
CMPIStatus st;
while (enm->ft->hasNext(enm, &st)
&& (ci = (enm->ft->getNext(enm, &st)).value.inst)) {
- CMPIObjectPath *hop;
cop = CMGetObjectPath(ci, &st);
- hop = CMGetKey(cop, "handler", NULL).value.ref;
st = processSubscription(broker,ctx,ci,cop);
/* if the on-disk repo is modified between startups, it is
possible for a subscription instance to exist w/o a filter or
diff --git a/msgqueue.c b/msgqueue.c
index 1ea77d5..adbcf43 100644
--- a/msgqueue.c
+++ b/msgqueue.c
@@ -716,7 +716,6 @@ stopLocalConnectServer()
static struct sockaddr_un *serverAddr;
int sock,
size = 0;
- unsigned long int l;
char *path;
if (getControlChars("localSocketPath", &path) != 0) {
@@ -740,7 +739,7 @@ stopLocalConnectServer()
return;
}
- l = write(sock, &size, sizeof(size));
+ write(sock, &size, sizeof(size));
close(sock);
}
diff --git a/objectImpl.c b/objectImpl.c
index 315d4a5..37d10a1 100644
--- a/objectImpl.c
+++ b/objectImpl.c
@@ -1218,12 +1218,8 @@ copyParameters(int ofs, int max, char *to, ClSection * ts,
static void
freeParameters(ClObjectHdr * hdr, ClSection * s)
{
- ClParameter *p;
-
_SFCB_ENTER(TRACE_OBJECTIMPL, "freeParameters");
- p = (ClParameter *) ClObjectGetClSection(hdr, s);
-
if (isMallocedSection(s))
free(s->sectionPtr);
diff --git a/predicate.c b/predicate.c
index 261d6bd..89e46b8 100644
--- a/predicate.c
+++ b/predicate.c
@@ -70,15 +70,14 @@ __eft_getData(const CMPIPredicate *pred, CMPIType *type,
if (op) {
if (op->opr == QL_bin) {
- QLOpd type = QL_Invalid;
if (op->lhon)
o = op->lhon;
else
o = op->rhon;
if (o->lhod && o->lhod->type != QL_PropertyName)
- type = o->lhod->type;
+ *type = (o->lhod->type < 0) ? CMPI_null : (CMPIType)o->lhod->type;
else if (o->rhod && o->rhod->type != QL_PropertyName)
- type = o->rhod->type;
+ *type = (o->rhod->type < 0) ? CMPI_null : (CMPIType)o->rhod->type;
if (opc)
*opc = o->opr;
if (lhs) {
diff --git a/providerDrv.c b/providerDrv.c
index edd68a5..fdec3c8 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -318,7 +318,6 @@ int
testStartedProc(int pid, int *left)
{
ProviderProcess *pp = provProc;
- ProviderInfo *info;
int i,
stopped = 0;
@@ -327,7 +326,6 @@ testStartedProc(int pid, int *left)
if ((pp + i)->pid == pid) {
stopped = 1;
(pp + i)->pid = 0;
- info = (pp + i)->firstProv;
if (pReg)
pReg->ft->resetProvider(pReg, pid);
}
@@ -1550,7 +1548,7 @@ enumClasses(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
CMPIObjectPath *path =
relocateSerializedObjectPath(req->objectPath.data);
CMPIStatus rci = { CMPI_RC_OK, NULL };
- CMPIArray *r;
+ // CMPIArray *r;
CMPIResult *result =
native_new_CMPIResult(requestor < 0 ? 0 : requestor, 0, NULL);
CMPIContext *ctx = native_new_CMPIContext(MEM_TRACKED, info);
@@ -1572,7 +1570,8 @@ enumClasses(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
rci =
info->classMI->ft->enumClasses(info->classMI, ctx, result, path);
TIMING_STOP(hdr, info)
- r = native_result2array(result);
+ //need to release ignored return value?
+ // native_result2array(result);
_SFCB_TRACE(1, ("--- Back from provider rc: %d", rci.rc));
@@ -2141,7 +2140,6 @@ modifyInstance(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
CMPIStatus rci = { CMPI_RC_OK, NULL };
CMPIResult *result = native_new_CMPIResult(0, 1, NULL);
CMPIContext *ctx = native_new_CMPIContext(MEM_TRACKED, info);
- CMPICount count;
BinResponseHdr *resp;
CMPIFlags flgs = 0;
char **props = NULL;
@@ -2170,7 +2168,6 @@ modifyInstance(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
_SFCB_TRACE(1, ("--- Back from provider rc: %d", rci.rc));
if (rci.rc == CMPI_RC_OK) {
- count = 1;
resp =
(BinResponseHdr *) calloc(1,
sizeof(BinResponseHdr) -
diff --git a/providerMgr.c b/providerMgr.c
index ade1098..519594a 100644
--- a/providerMgr.c
+++ b/providerMgr.c
@@ -985,8 +985,6 @@ processProviderMgrRequests()
unsigned long rl;
int rc,
options = 0;
- char *cn,
- *ns;
MqgStat mqg;
_SFCB_ENTER(TRACE_PROVIDERMGR, "processProviderMgrRequests");
@@ -1037,8 +1035,6 @@ processProviderMgrRequests()
(void *) ((long) req->className.data + (char *) req);
else
req->className.data = NULL;
- cn = (char *) req->className.data;
- ns = (char *) req->nameSpace.data;
options = req->options;
_SFCB_TRACE(1,
@@ -1812,7 +1808,6 @@ _getConstClassChildren(const char *ns, const char *cn)
OperationHdr req = { OPS_InvokeMethod, 1 };
CMPIArgs *in = NewCMPIArgs(NULL);
CMPIArgs *out = NULL;
- CMPIData data;
CMPIArray *ar = NULL;
CMPIStatus rc;
UtilList *ul = NULL;
@@ -1830,8 +1825,7 @@ _getConstClassChildren(const char *ns, const char *cn)
irc = _methProvider(&binCtx, &req);
if (irc == MSG_X_PROVIDER) {
- data =
- localInvokeMethod(&binCtx, path, "getchildren", in, &out, &rc, 0);
+ localInvokeMethod(&binCtx, path, "getchildren", in, &out, &rc, 0);
if (out) {
ar = CMGetArg(out, "children", &rc).value.array;
ul = UtilFactory->newList(NULL, NULL);
@@ -1863,7 +1857,6 @@ _getAssocClassNames(const char *ns)
OperationHdr req = { OPS_InvokeMethod, 1 };
CMPIArgs *in = NewCMPIArgs(NULL);
CMPIArgs *out = NULL;
- CMPIData data;
CMPIArray *ar;
CMPIStatus rc;
UtilList *ul = NULL;
@@ -1881,7 +1874,7 @@ _getAssocClassNames(const char *ns)
irc = _methProvider(&binCtx, &req);
if (irc == MSG_X_PROVIDER) {
- data = localInvokeMethod(&binCtx, path, "getassocs", in, &out, &rc, 0);
+ localInvokeMethod(&binCtx, path, "getassocs", in, &out, &rc, 0);
if (out) {
ar = CMGetArg(out, "assocs", &rc).value.array;
ul = UtilFactory->newList(NULL, NULL);
diff --git a/queryOperation.h b/queryOperation.h
index 0f72b73..98b6a13 100644
--- a/queryOperation.h
+++ b/queryOperation.h
@@ -52,21 +52,22 @@ typedef struct qlCollector QLCollector;
extern void *qsAlloc(QLStatement * qs, unsigned int size);
+/* use negative number to avoid collisions with CMPI types */
typedef enum qlOpd {
- QL_Invalid,
- QL_NotFound,
- QL_Null,
- QL_Integer,
- QL_UInteger,
- QL_Double,
- QL_Boolean,
- QL_Chars,
- QL_Char,
- QL_PropertyName,
- QL_Name,
- QL_Inst,
- QL_Ref,
- QL_DateTime,
+ QL_Invalid = -2,
+ QL_NotFound = -1,
+ QL_Null = CMPI_null,
+ QL_Integer = CMPI_SINT,
+ QL_UInteger = CMPI_UINT,
+ QL_Double = CMPI_real64,
+ QL_Boolean = CMPI_boolean,
+ QL_Chars = CMPI_chars,
+ QL_Char = CMPI_char16,
+ QL_PropertyName = CMPI_string,
+ QL_Name = CMPI_nameString,
+ QL_Inst = CMPI_instance,
+ QL_Ref = CMPI_ref,
+ QL_DateTime = CMPI_dateTime,
} QLOpd;
typedef enum qlFnc {
diff --git a/queryParser.y b/queryParser.y
index fc4635f..64d9359 100644
--- a/queryParser.y
+++ b/queryParser.y
@@ -75,7 +75,7 @@ extern int yylex(void *);
extern void sfcQueryErr(char*,char*,char*);
extern void yyError(char*);
extern void yyerror(char*);
-extern void sfcQueryError(char* s1);
+extern void sfcQueryError(const char* s1);
extern char * qsStrDup(QLStatement *qs, char *str);
extern QLOperand* newNameQueryOperand(QLStatement *qs, char* val);
@@ -467,7 +467,7 @@ functionArg
builtInFunction
: TOK_IDENTIFIER functionArg
{
- int fnc=QL_FNC_NoFunction;
+ int fnc __attribute__ ((unused)) =QL_FNC_NoFunction;
if (QS->lang==QL_CQL) {
if (strcasecmp($1,"classname")==0) fnc=QL_FNC_Classname;
else if (strcasecmp($1,"namespacename")==0) fnc=QL_FNC_Namespacename;
diff --git a/sfcBroker.c b/sfcBroker.c
index 745191b..1d9f164 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -83,10 +83,6 @@ extern TraceId traceIds[];
extern unsigned long exFlags;
static int startHttp = 0;
-#ifdef HAVE_JDBC
-static int startDbp = 1;
-#endif
-
char *name;
extern int collectStat;
@@ -193,7 +189,7 @@ static void
stopBroker(void *p)
{
struct timespec waitTime;
- int rc,sa=0,sp=0, count = 0;
+ int sa=0,sp=0, count = 0;
/* SF 3497096 bugzilla 77022 */
/* stopping is set to prevent other threads calling this routine */
@@ -234,7 +230,7 @@ stopBroker(void *p)
fprintf(stderr, "--- Stopping adapters\n");
sa++;
if (stopNextAdapter()) {
- rc = pthread_cond_timedwait(&sdCnd, &sdMtx, &waitTime);
+ pthread_cond_timedwait(&sdCnd, &sdMtx, &waitTime);
} else {
/*
* no adapters found
@@ -253,7 +249,7 @@ stopBroker(void *p)
fprintf(stderr, "--- Stopping providers\n");
sp++;
if (stopNextProc()) {
- rc = pthread_cond_timedwait(&sdCnd, &sdMtx, &waitTime);
+ pthread_cond_timedwait(&sdCnd, &sdMtx, &waitTime);
}
// else providersStopped=1;
pthread_mutex_unlock(&sdMtx);
@@ -398,7 +394,7 @@ handleSigUsr2(int sig)
{
#ifndef LOCAL_CONNECT_ONLY_ENABLE
struct timespec waitTime;
- int rc, sa=0;
+ int sa=0;
inaHttpdRestart=1;
while(!adaptersStopped) {
@@ -408,7 +404,7 @@ handleSigUsr2(int sig)
if (sa==0) fprintf(stderr,"--- Stopping http adapters\n");
sa++;
if (stopNextAdapter()) {
- rc=pthread_cond_timedwait(&sdCnd,&sdMtx,&waitTime);
+ pthread_cond_timedwait(&sdCnd,&sdMtx,&waitTime);
}
else {
/* no adapters found */
@@ -442,12 +438,11 @@ handleSigSegv(int sig)
static int
startHttpd(int argc, char *argv[], int sslMode)
{
- int pid,
- sfcPid = currentProc;
+ int pid;
int httpSFCB,
rc;
char *httpUser;
- uid_t httpuid;
+ uid_t httpuid = 0;
struct passwd *passwd;
// Get/check http user info
@@ -514,35 +509,6 @@ startHttpd(int argc, char *argv[], int sslMode)
#endif // LOCAL_CONNECT_ONLY_ENABLE
-#ifdef HAVE_JDBC
-
-extern int dbpDaemon(int argc, char *argv[], int sslMode,
- int sfcbPid);
-static int
-startDbpd(int argc, char *argv[], int sslMode)
-{
- int pid,
- sfcPid = currentProc;
- // sleep(2);
- pid = fork();
- if (pid < 0) {
- perror("dbpd fork");
- exit(2);
- }
- if (pid == 0) {
- currentProc = getpid();
- dbpDaemon(argc, argv, sslMode, sfcPid);
- closeSocket(&sfcbSockets, cRcv, "startHttpd");
- closeSocket(&resultSockets, cAll, "startHttpd");
- } else {
- addStartedAdapter(pid);
- return 0;
- }
- return 0;
-}
-
-#endif
-
static void
usage(int status)
{
@@ -632,7 +598,6 @@ main(int argc, char *argv[])
i;
long tmask = 0,
//sslMode = 0, /* 3597805 */
- sslOMode = 0,
tracelevel = 0;
char *tracefile = NULL;
#ifdef HAVE_UDS
@@ -850,16 +815,10 @@ main(int argc, char *argv[])
enableHttps = 0;
sslMode = enableHttps;
-#ifdef HAVE_UDS
- sslOMode = sslMode & !enableHttp & !enableUds;
-#else
- sslOMode = sslMode & !enableHttp;
-#endif
#else
mlogf(M_INFO, M_SHOW, "--- SSL not configured\n");
enableHttps = 0;
sslMode = 0;
- sslOMode = 0;
#endif
if (getControlBool("useChunking", &useChunking))
@@ -1022,16 +981,6 @@ main(int argc, char *argv[])
#endif
mlogf(M_INFO, M_SHOW, "--- Request handlers enabled:%s\n",rtmsg);
-#ifdef HAVE_JDBC
- // Start dbProtocol-Daemon
- if (startDbp) {
- if (sslMode)
- startDbpd(argc, argv, 1);
- if (!sslOMode)
- startDbpd(argc, argv, 0);
- }
-#endif
-
setSignal(SIGSEGV, handleSigSegv, SA_ONESHOT);
setSignal(SIGCHLD, handleSigChld, 0);
setSignal(SIGUSR2, handleSigUsr2, 0);
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
