From cc3f02050559b82feaf1db334103a4ddaaa6ee53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Mon, 20 Nov 2006 20:25:47 +0000 Subject: [PATCH] Improved intJobStat definition. Also, a few referencing/dereferencing problems (warnings) have been resolved. --- org.glite.lb.server/src/jobstat.h | 2 +- org.glite.lb.server/src/jobstat_supp.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.glite.lb.server/src/jobstat.h b/org.glite.lb.server/src/jobstat.h index 93f2f1d..dace952 100644 --- a/org.glite.lb.server/src/jobstat.h +++ b/org.glite.lb.server/src/jobstat.h @@ -52,7 +52,7 @@ typedef struct _intJobStat { branch_state *branch_states; // branch zero terminated array /* int expect_mask; */ - enum edg_wll_StatDone_code children_done_hist[EDG_WLL_NUMBER_OF_DONE_CODES]; + int children_done_hist[EDG_WLL_NUMBER_OF_DONE_CODES]; } intJobStat; void destroy_intJobStat(intJobStat *); diff --git a/org.glite.lb.server/src/jobstat_supp.c b/org.glite.lb.server/src/jobstat_supp.c index 694150c..504284f 100644 --- a/org.glite.lb.server/src/jobstat_supp.c +++ b/org.glite.lb.server/src/jobstat_supp.c @@ -114,7 +114,7 @@ static int dec_int(char* in, char **rest) return out; } -static int dec_int_array(char* in, char **rest, int *out) +static int dec_int_array(char* in, char **rest, int *out) // Returns the number of items found in the array { int charNo, itemsNo = 0, cindex, iindex = 0, lenindex; char *tempstr; @@ -134,7 +134,7 @@ static int dec_int_array(char* in, char **rest, int *out) itemsNo = 1; /* - consider it an one-item array */ *rest = NULL; } - else *rest = charNo + 1; + else *rest = in + charNo + 1; tempstr = (char*)calloc(charNo+1,sizeof(char)); @@ -157,7 +157,7 @@ static int dec_int_array(char* in, char **rest, int *out) free(tempstr); *rest = in + charNo + 1; - return out; + return itemsNo; } @@ -605,7 +605,7 @@ intJobStat* dec_intJobStat(char *in, char **rest) stat->branch_states = dec_branch_states(tmp_in, &tmp_in); } if (tmp_in != NULL) { - dec_int_array(tmp_in, &tmp_in, &stat->children_done_hist); + dec_int_array(tmp_in, &tmp_in, stat->children_done_hist); } } else if (tmp_in != NULL) { edg_wll_FreeStatus(pubstat); -- 1.8.2.3