From c61b65b9482ce2b0cae2a3d73a50cd3d0ad821dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Tue, 16 Oct 2007 16:37:43 +0000 Subject: [PATCH] merge cleanup --- org.glite.lb.common/interface/context-int.h | 8 ++------ org.glite.lb.common/src/context.c | 7 +------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/org.glite.lb.common/interface/context-int.h b/org.glite.lb.common/interface/context-int.h index 52bdd1e..46f92f0 100644 --- a/org.glite.lb.common/interface/context-int.h +++ b/org.glite.lb.common/interface/context-int.h @@ -19,18 +19,15 @@ extern "C" { <<<<<<< context-int.h #define EDG_WLL_SEQ_NULL "UI=000000:NS=0000000000:WM=000000:BH=0000000000:JSS=000000:LM=000000:LRMS=000000:APP=000000:LBS=000000" #define EDG_WLL_SEQ_PBS_NULL "TIMESTAMP=00000000000000:POS=0000000000:EV.CODE=000:SRC=?" -#define EDG_WLL_SEQ_CONDOR_NULL EDG_WLL_SEQ_PBS_NULL -#define EDG_WLL_SEQ_SIZE 103 /* strlen(EDG_WLL_SEQ_NULL)+1 */ -#define EDG_WLL_SEQ_PBS_SIZE 57 /* strlen(EDG_WLL_SEQ_PBS_NULL)+1 */ -#define EDG_WLL_SEQ_CONDOR_SIZE EDG_WLL_SEQ_PBS_SIZE ======= + #define EDG_WLL_SEQ_NULL "UI=000000:NS=0000000000:WM=000000:BH=0000000000:JSS=000000:LM=000000:LRMS=000000:APP=000000:LBS=000000" #define EDG_WLL_SEQ_PBS_NULL "TIMESTAMP=00000000000000:POS=0000000000:EV.CODE=000:SRC=?" +>>>>>>> 1.26.2.4 #define EDG_WLL_SEQ_CONDOR_NULL EDG_WLL_SEQ_PBS_NULL #define EDG_WLL_SEQ_SIZE (sizeof(EDG_WLL_SEQ_NULL)) #define EDG_WLL_SEQ_PBS_SIZE (sizeof(EDG_WLL_SEQ_PBS_NULL)) #define EDG_WLL_SEQ_CONDOR_SIZE EDG_WLL_SEQ_PBS_SIZE ->>>>>>> 1.26.2.4 typedef struct _edg_wll_SeqCode { unsigned int type; /* seq code type */ @@ -147,7 +144,6 @@ glite_lb_padded_struct(_edg_wll_Context,120, int count_statistics; int greyjobs; - char **fqans; /* null-terminated list of peer's VOMS FQANs */ ) diff --git a/org.glite.lb.common/src/context.c b/org.glite.lb.common/src/context.c index f6ecf5d..52d3c32 100644 --- a/org.glite.lb.common/src/context.c +++ b/org.glite.lb.common/src/context.c @@ -482,19 +482,14 @@ int edg_wll_GenerateSubjobIds( /* TODO: merge */ <<<<<<< context.c if ( !seed || !strcmp(seed, "(nil)") ) { - intseed = strdup("edg_wll_GenerateSubjobIds()"); - } - else - intseed = strdup(seed); - ======= if ( !seed ) { +>>>>>>> 1.23.2.10 intseed = strdup("edg_wll_GenerateSubjobIds()"); } else intseed = strdup(seed); ->>>>>>> 1.23.2.10 for (subjob = 0; subjob < num_subjobs; subjob++) { asprintf(&unhashed, "%s,%s,%d", p_unique, intseed, subjob); -- 1.8.2.3