strcmp() on attribute names

diff --git a/org.glite.lb.server/src/lb_plugin.c b/org.glite.lb.server/src/lb_plugin.c
index b7a9413..77f3cf3 100644 (file)
--- a/org.glite.lb.server/src/lb_plugin.c
+++ b/org.glite.lb.server/src/lb_plugin.c
@@ -200,74 +200,73 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t
         memset(&err,0,sizeof err);
         err.source = __FUNCTION__;
 
-       if (strncmp(attr, GLITE_JP_ATTR_OWNER, strlen(GLITE_JP_ATTR_OWNER)) == 0 ||
-            strncmp(attr, GLITE_JP_LB_user, strlen(GLITE_JP_LB_user)) == 0) {
+        if (strcmp(attr, GLITE_JP_LB_user) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
-               av[0].name = strdup(GLITE_JP_ATTR_OWNER);
+               av[0].name = strdup(GLITE_JP_LB_user);
                av[0].value = check_strdup(h->status.owner);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_ATTR_JOBID, strlen(GLITE_JP_ATTR_JOBID)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_ATTR_JOBID) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_ATTR_JOBID);
                av[0].value = edg_wlc_JobIdUnparse(h->status.jobId);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_VO, strlen(GLITE_JP_LB_VO)) == 0 ||
-                   strncmp(attr, GLITE_JP_LB_aTag, strlen(GLITE_JP_LB_aTag)) == 0 ||
-                   strncmp(attr, GLITE_JP_LB_rQType, strlen(GLITE_JP_LB_rQType)) == 0 ||
-                   strncmp(attr, GLITE_JP_LB_eDuration, strlen(GLITE_JP_LB_eDuration)) == 0 ||
-                   strncmp(attr, GLITE_JP_LB_eNodes, strlen(GLITE_JP_LB_eNodes)) == 0 ||
-                   strncmp(attr, GLITE_JP_LB_eProc, strlen(GLITE_JP_LB_eProc)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_VO) == 0 ||
+                   strcmp(attr, GLITE_JP_LB_aTag) == 0 ||
+                   strcmp(attr, GLITE_JP_LB_rQType) == 0 ||
+                   strcmp(attr, GLITE_JP_LB_eDuration) == 0 ||
+                   strcmp(attr, GLITE_JP_LB_eNodes) == 0 ||
+                   strcmp(attr, GLITE_JP_LB_eProc) == 0) {
                /* have to be retrieved from JDL */
                *attrval = NULL;
                err.code = ENOSYS;
                err.desc = "Not implemented yet.";
                return glite_jp_stack_error(ctx,&err);
-       } else if (strncmp(attr, GLITE_JP_LB_RB, strlen(GLITE_JP_LB_RB)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_RB) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_RB);
                av[0].value = check_strdup(h->status.network_server);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_CE, strlen(GLITE_JP_LB_CE)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_CE) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_CE);
                av[0].value = check_strdup(h->status.destination);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_host, strlen(GLITE_JP_LB_host)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_host) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_host);
                av[0].value = check_strdup(h->status.ce_node);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_UIHost, strlen(GLITE_JP_LB_UIHost)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_UIHost) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_UIHost);
                av[0].value = check_strdup(h->status.location);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_CPUTime, strlen(GLITE_JP_LB_CPUTime)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_CPUTime) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_CPUTime);
                trio_asprintf(&av[0].value,"%d",
                        h->status.cpuTime);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_NProc, strlen(GLITE_JP_LB_NProc)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_NProc) == 0) {
                /* currently LB hasn't got the info */
                *attrval = NULL;
                err.code = ENOSYS;
                err.desc = "Not implemented yet.";
                return glite_jp_stack_error(ctx,&err);
-       } else if (strncmp(attr, GLITE_JP_LB_finalStatus, strlen(GLITE_JP_LB_finalStatus)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_finalStatus) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_finalStatus);
                av[0].value = edg_wll_StatToString(h->status.state);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_finalStatusDate, strlen(GLITE_JP_LB_finalStatusDate)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_finalStatusDate) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_finalStatusDate);
                 trio_asprintf(&av[0].value,"%ld.%06ld",  
@@ -275,19 +274,19 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t
                        h->status.lastUpdateTime.tv_usec);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_finalStatusReason, strlen(GLITE_JP_LB_finalStatusReason)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_finalStatusReason) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_finalStatusReason);
                av[0].value = check_strdup(h->status.reason);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_LRMSDoneStatus, strlen(GLITE_JP_LB_LRMSDoneStatus)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_LRMSDoneStatus) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_LRMSDoneStatus);
                av[0].value = edg_wll_DoneStatus_codeToString(h->status.done_code);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_LRMSStatusReason, strlen(GLITE_JP_LB_LRMSStatusReason)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_LRMSStatusReason) == 0) {
                 if (h->events) {
                         i = 0;
                         while (h->events[i]) {
@@ -302,40 +301,40 @@ static int lb_query(void *fpctx,void *handle,const char *attr,glite_jp_attrval_t
                                 i++;
                         }
                 }
-       } else if (strncmp(attr, GLITE_JP_LB_retryCount, strlen(GLITE_JP_LB_retryCount)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_retryCount) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_retryCount);
                trio_asprintf(&av[0].value,"%d",
                        h->status.resubmitted);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_additionalReason, strlen(GLITE_JP_LB_additionalReason)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_additionalReason) == 0) {
                /* what is it? */
                *attrval = NULL;
                err.code = ENOSYS;
                err.desc = "Not implemented yet.";
                return glite_jp_stack_error(ctx,&err);
-       } else if (strncmp(attr, GLITE_JP_LB_jobType, strlen(GLITE_JP_LB_jobType)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_jobType) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_jobType);
                av[0].value = edg_wll_RegJobJobtypeToString(h->status.jobtype);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_nsubjobs, strlen(GLITE_JP_LB_nsubjobs)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_nsubjobs) == 0) {
                av = calloc(2, sizeof(glite_jp_attrval_t));
                av[0].name = strdup(GLITE_JP_LB_nsubjobs);
                trio_asprintf(&av[0].value,"%d",
                        h->status.children_num);
                av[0].size = -1;
                av[0].timestamp = h->status.lastUpdateTime.tv_sec;
-       } else if (strncmp(attr, GLITE_JP_LB_lastStatusHistory, strlen(GLITE_JP_LB_lastStatusHistory)) == 0 ||
-                  strncmp(attr, GLITE_JP_LB_fullStatusHistory, strlen(GLITE_JP_LB_fullStatusHistory)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LB_lastStatusHistory) == 0 ||
+                  strcmp(attr, GLITE_JP_LB_fullStatusHistory) == 0) {
                /* complex types */
                *attrval = NULL;
                err.code = ENOSYS;
                err.desc = "Not implemented yet.";
                return glite_jp_stack_error(ctx,&err);
-       } else if (strncmp(attr, GLITE_JP_LBTAG_NS, strlen(GLITE_JP_LBTAG_NS)) == 0) {
+       } else if (strcmp(attr, GLITE_JP_LBTAG_NS) == 0) {
                tag = strrchr(attr, ':');
                if (h->events && tag) {
                        tag++;