From d0ee28dc462a88deec966a4370032fbcd269c4a4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Thu, 28 Feb 2008 10:11:39 +0000 Subject: [PATCH] purge roughly working - mispaced assert - uninitialized variable freed --- org.glite.lb.server/src/srv_purge.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/org.glite.lb.server/src/srv_purge.c b/org.glite.lb.server/src/srv_purge.c index 674b725..41b395d 100644 --- a/org.glite.lb.server/src/srv_purge.c +++ b/org.glite.lb.server/src/srv_purge.c @@ -508,7 +508,7 @@ static int dump_events(edg_wll_Context ctx, glite_jobid_const_t job, int dump, c int purge_one(edg_wll_Context ctx,glite_jobid_const_t job,int dump, int purge, int purge_from_proxy_only) { - char *dbjob; + char *dbjob = NULL; char *stmt = NULL; glite_lbu_Statement q; int ret,dumped = 0; @@ -530,6 +530,10 @@ int purge_one(edg_wll_Context ctx,glite_jobid_const_t job,int dump, int purge, i /* continue */ break; case DB_SERVER_JOB: + if (purge_from_proxy_only) { + /* no action needed */ + goto commit; + } if (ctx->isProxy) { /* should not happen */ goto commit; @@ -607,11 +611,12 @@ int purge_one(edg_wll_Context ctx,glite_jobid_const_t job,int dump, int purge, i int event; - assert(ret == 9); event = atoi(res[0]); - if (dump >= 0) + if (dump >= 0) { + assert(ret == 9); if (dump_events( ctx, job, dump, (char **) &res)) goto rollback; + } if ( purge ) if (edg_wll_delete_event(ctx,dbjob,event)) goto rollback; -- 1.8.2.3