lib/libadminutil/psetc.c | 13 ++++---------
lib/libadmsslutil/admsslutil.c | 2 ++
2 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit f20dc1bd6f415802ecc0adce3c11932144357403
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Fri Apr 15 14:00:11 2011 -0700
Bug 697110 - (cov#10757) Remove unused variable in psetRootModAttrList()
The "partial" variable in psetRootModAttrList() will never be set
to anything other than 0. This variable should be removed along
with the if conditions that check if it is set.
diff --git a/lib/libadminutil/psetc.c b/lib/libadminutil/psetc.c
index e0ede60..79f2b6d 100644
--- a/lib/libadminutil/psetc.c
+++ b/lib/libadminutil/psetc.c
@@ -1187,7 +1187,6 @@ psetRootModAttrList(PsetRootPtr psetRoot, int mode, AttributeList
nvl)
PsetNodePtr target;
ListNodePtr updateList = NULL, attrList, nodePtr, attrPtr;
int nodeFlag;
- int partial = 0;
ValueType val;
updateList = createUpdateList(nvl);
@@ -1199,8 +1198,7 @@ psetRootModAttrList(PsetRootPtr psetRoot, int mode, AttributeList
nvl)
(pset->configFile) &&
!(pset->fileRW)) {
destroyUpdateList(updateList);
- if (partial) return PSET_PARTIAL_OP;
- else return PSET_LOCAL_MODE;
+ return PSET_LOCAL_MODE;
}
if (target && nodeFlag) {
@@ -1217,8 +1215,7 @@ psetRootModAttrList(PsetRootPtr psetRoot, int mode, AttributeList
nvl)
if (!val) {
/* Arrtibute does not exist */
destroyUpdateList(updateList);
- if (partial) return PSET_PARTIAL_OP;
- else return PSET_ATTR_NOT_EXIST;
+ return PSET_ATTR_NOT_EXIST;
}
else deleteValue (val);
break;
@@ -1227,8 +1224,7 @@ psetRootModAttrList(PsetRootPtr psetRoot, int mode, AttributeList
nvl)
/* Attribute already exist */
deleteValue (val);
destroyUpdateList(updateList);
- if (partial) return PSET_PARTIAL_OP;
- else return PSET_ATTR_EXIST;
+ return PSET_ATTR_EXIST;
}
break;
default:
@@ -1279,8 +1275,7 @@ psetRootModAttrList(PsetRootPtr psetRoot, int mode, AttributeList
nvl)
errorcode = PSET_NOT_ENTRY;
destroyUpdateList(updateList);
if (errorcode) {
- if (partial) return PSET_PARTIAL_OP;
- else return errorcode;
+ return errorcode;
}
}
nodePtr=nodePtr->next;
commit 1ee23e9033960a5a3e8e271ae3ee14b5cb89544f
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Fri Apr 15 13:47:18 2011 -0700
Bug 697106 - (cov#10770) Need to call va_end() after calling va_start()
In adminutil, we call va_start() in servssl_error() and servssl_warn()
functions, but we never call va_end(). We should be calling va_end()
in these functions.
diff --git a/lib/libadmsslutil/admsslutil.c b/lib/libadmsslutil/admsslutil.c
index ab5132e..7e560ee 100644
--- a/lib/libadmsslutil/admsslutil.c
+++ b/lib/libadmsslutil/admsslutil.c
@@ -255,6 +255,7 @@ void servssl_error(char *fmt, ...)
va_start(args, fmt);
PR_vsnprintf(errstr, sizeof(errstr), fmt, args);
+ va_eng(args);
#ifdef XP_UNIX
fprintf(stderr, "%s\n", errstr);
#else /* XP_WIN32 */
@@ -271,6 +272,7 @@ void servssl_warn(char *fmt, ...)
va_start(args, fmt);
PR_vsnprintf(warnstr, sizeof(warnstr), fmt, args);
+ va_eng(args);
#ifdef XP_UNIX
fprintf(stderr, "%s\n", warnstr);
#else /* XP_WIN32 */