From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Wed, 23 Jul 2008 07:50:37 +0000 (+0000)
Subject: user_fqans moved from intStat to public state
X-Git-Tag: merge_316_6_after~71
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3fb3a0563e0208a199576d9da6361e8df121dd99;p=jra1mw.git

user_fqans moved from intStat to public state
---

diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c
index cd05548..6e31268 100644
--- a/org.glite.lb.server/src/jobstat.c
+++ b/org.glite.lb.server/src/jobstat.c
@@ -442,11 +442,11 @@ int edg_wll_intJobStatus(
 			int tsq = num_events - 1;
 			if (add_fqans && tsq == 0 && ctx->fqans != NULL) {
 				for (i=0; ctx->fqans[i]; i++);
-				intstat->user_fqans = malloc(sizeof(*ctx->fqans)*(i+1));
+				intstat->pub.user_fqans = malloc(sizeof(*ctx->fqans)*(i+1));
 				for (i=0; ctx->fqans[i]; i++) {
-					intstat->user_fqans[i] = strdup(ctx->fqans[i]);
+					intstat->pub.user_fqans[i] = strdup(ctx->fqans[i]);
 				}
-				intstat->user_fqans[i] = NULL;
+				intstat->pub.user_fqans[i] = NULL;
 			}
 
 			edg_wll_StoreIntState(ctx, intstat, tsq);
diff --git a/org.glite.lb.server/src/write2rgma.c b/org.glite.lb.server/src/write2rgma.c
index 67ec1a0..c6b4e4a 100755
--- a/org.glite.lb.server/src/write2rgma.c
+++ b/org.glite.lb.server/src/write2rgma.c
@@ -180,7 +180,7 @@ char* write2rgma_statline(intJobStat *intstat)
 	string_jobid = edg_wlc_JobIdUnparse(stat->jobId);
 	string_stat = edg_wll_StatToString(stat->state);
 	string_server = edg_wlc_JobIdGetServer(stat->jobId);
-	string_fqans = format_strlist(intstat->user_fqans, '|');
+	string_fqans = format_strlist(intstat->pub.user_fqans, '|');
 
 	if (stat->jdl != NULL) {
 		struct cclassad *ad;
diff --git a/org.glite.lb.state-machine/src/process_event.c b/org.glite.lb.state-machine/src/process_event.c
index 2e78aa0..e9ffbdd 100644
--- a/org.glite.lb.state-machine/src/process_event.c
+++ b/org.glite.lb.state-machine/src/process_event.c
@@ -990,11 +990,6 @@ void destroy_intJobStat_extension(intJobStat *p)
 	if (p->last_branch_seqcode) free(p->last_branch_seqcode);
 	if (p->deep_resubmit_seqcode) free(p->deep_resubmit_seqcode);
 	free_branch_state(&p->branch_states);
-	if (p->user_fqans != NULL ) {
-                for (i=0; p->user_fqans[i]; i++)
-                        free(p->user_fqans[i]);
-                free(p->user_fqans);
-        }
 
 	memset(p,0,sizeof(*p));
 }