From f3d7994ff695fe088a8f67c47ffcc90dcd82af0a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Tue, 15 Dec 2009 14:01:55 +0000 Subject: [PATCH] renaming variables introduced with file transfers to avoid name conflicts --- org.glite.lb.client/src/EventAttrNames.pl | 5 +++++ org.glite.lb.client/src/StatusAttrNames.pl | 6 ++++++ org.glite.lb.client/src/logevent.c.T | 6 +++--- org.glite.lb.types/events.T | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/org.glite.lb.client/src/EventAttrNames.pl b/org.glite.lb.client/src/EventAttrNames.pl index 0bebc72..f5e944b 100644 --- a/org.glite.lb.client/src/EventAttrNames.pl +++ b/org.glite.lb.client/src/EventAttrNames.pl @@ -88,4 +88,9 @@ NEW_STATE OLD_STATE ORIG_TIMESTAMP + SRC + DEST + VARIANT + TRANSFER_JOB + COMPUTE_JOB /; diff --git a/org.glite.lb.client/src/StatusAttrNames.pl b/org.glite.lb.client/src/StatusAttrNames.pl index 84ddfce..ac0f8a0 100644 --- a/org.glite.lb.client/src/StatusAttrNames.pl +++ b/org.glite.lb.client/src/StatusAttrNames.pl @@ -86,4 +86,10 @@ CREAM_OWNER CREAM_REASON CREAM_STATE + FT_COMPUTE_JOB + FT_SANDBOX_TYPE + FT_SRC + FT_DEST + ISB_TRANSFER + OSB_TRANSFER /; diff --git a/org.glite.lb.client/src/logevent.c.T b/org.glite.lb.client/src/logevent.c.T index 8df365c..a68c0ef 100644 --- a/org.glite.lb.client/src/logevent.c.T +++ b/org.glite.lb.client/src/logevent.c.T @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) int elength = 0; #endif edg_wll_Context ctx; - edg_wll_Source src; + edg_wll_Source source; edg_wll_EventCode event = EDG_WLL_EVENT_UNDEF; edg_wlc_JobId jobid = 0; int seq = EDG_WLL_SEQ_NORMAL; @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) { EDG_WLL_ARGS_STRING, "U", "lbproxy-user-dn", "User certificate DN L&B Proxy store socket path", &lbproxy_user }, { EDG_WLL_ARGS_STRING, "m", "machine", 0, &server }, - { EDG_WLL_ARGS_SOURCE, "s", "source", "event source (see -s help)", &src }, + { EDG_WLL_ARGS_SOURCE, "s", "source", "event source (see -s help)", &source }, { EDG_WLL_ARGS_STRING, "i", "source-instance", "event source instance", &src_instance }, { EDG_WLL_ARGS_STRING, "j", "jobid", "JobId", &jobid_s }, { EDG_WLL_ARGS_STRING, "c", "sequence", "event sequence code", &code }, @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) fprintf(stderr,"%s: unknown or unspecified event\n",argv[0]); exit(1); } - edg_wll_SetParam(ctx, EDG_WLL_PARAM_SOURCE, src); + edg_wll_SetParam(ctx, EDG_WLL_PARAM_SOURCE, source); if (src_instance) edg_wll_SetParam(ctx, EDG_WLL_PARAM_INSTANCE, src_instance); edg_wll_SetParam(ctx, EDG_WLL_PARAM_LEVEL, (deb) ? EDG_WLL_LEVEL_DEBUG : EDG_WLL_LEVEL_SYSTEM); diff --git a/org.glite.lb.types/events.T b/org.glite.lb.types/events.T index 6f51d72..15aed86 100644 --- a/org.glite.lb.types/events.T +++ b/org.glite.lb.types/events.T @@ -433,7 +433,7 @@ string reason The reason of file transfer failure. @type Sandbox event for logging relationship between (compute) job and (file) transfer job - int type Type of sandbox. + int variant Type of sandbox. _code_ INPUT _code_ OUTPUT string transfer_job Jobid of transfer job (collection) containing set of file transfers (subjobs). -- 1.8.2.3