after merge garbage collection

- compiles, does not link, some warnings remain

diff --git a/org.glite.lb.server/src/jobstat.h b/org.glite.lb.server/src/jobstat.h
index aac8d80..a45c376 100644 (file)
--- a/org.glite.lb.server/src/jobstat.h
+++ b/org.glite.lb.server/src/jobstat.h
@@ -64,7 +64,19 @@ typedef enum _edg_wll_PBSEventSource {
        EDG_WLL_PBS_EVENT_SOURCE__LAST
 } edg_wll_PBSEventSource;
 
-int edg_wll_JobStatus(edg_wll_Context, const edg_wlc_JobId, int, edg_wll_JobStat *);
+typedef enum _edg_wll_CondorEventSource {
+       EDG_WLL_CONDOR_EVENT_SOURCE_UNDEF = 0,
+       EDG_WLL_CONDOR_EVENT_SOURCE_COLLECTOR,
+       EDG_WLL_CONDOR_EVENT_SOURCE_MASTER,
+       EDG_WLL_CONDOR_EVENT_SOURCE_MATCH,
+       EDG_WLL_CONDOR_EVENT_SOURCE_NEGOTIATOR,
+       EDG_WLL_CONDOR_EVENT_SOURCE_SCHED,
+       EDG_WLL_CONDOR_EVENT_SOURCE_SHADOW,
+       EDG_WLL_CONDOR_EVENT_SOURCE_STARTER,
+       EDG_WLL_CONDOR_EVENT_SOURCE_START,
+       EDG_WLL_CONDOR_EVENT_SOURCE_JOBQUEUE,
+       EDG_WLL_CONDOR_EVENT_SOURCE__LAST
+} edg_wll_CondorEventSource;
 
 typedef enum _subjobClassCodes {
        SUBJOB_CLASS_UNDEF = 0,
@@ -75,6 +87,8 @@ typedef enum _subjobClassCodes {
        SUBJOB_CLASS_REST
 } subjobClassCodes;
 
+int edg_wll_JobStatus(edg_wll_Context, const edg_wlc_JobId, int, edg_wll_JobStat *);
+
 void destroy_intJobStat(intJobStat *);
 void destroy_intJobStat_extension(intJobStat *p);
 

diff --git a/org.glite.lb.server/src/lb_authz.c b/org.glite.lb.server/src/lb_authz.c
index 9543dfc..751067b 100644 (file)
--- a/org.glite.lb.server/src/lb_authz.c
+++ b/org.glite.lb.server/src/lb_authz.c
@@ -112,6 +112,8 @@ get_groups(edg_wll_Context ctx, struct vomsdata *voms_info,
 int
 edg_wll_SetVomsGroups(edg_wll_Context ctx, edg_wll_GssConnection *gss, char *server_cert, char *server_key, char *voms_dir, char *ca_dir)
 {
+   STACK_OF(X509) *p_chain = NULL;
+   X509 *cert = NULL;
    int ret;
    int err = 0;
    struct vomsdata *voms_info = NULL;

diff --git a/org.glite.lb.server/src/srv_purge.c b/org.glite.lb.server/src/srv_purge.c
index d802f1a..b0093d4 100644 (file)
--- a/org.glite.lb.server/src/srv_purge.c
+++ b/org.glite.lb.server/src/srv_purge.c
@@ -28,6 +28,7 @@
 #include "lb_xml_parse.h"
 #include "db_calls.h"
 #include "db_supp.h"
+#include "jobstat.h"
 
 
 #define DUMP_FILE_STORAGE                                      "/tmp/"
@@ -344,8 +345,11 @@ int edg_wll_PurgeServer(edg_wll_Context ctx,const edg_wll_PurgeRequest *request)
                        }
                }
                glite_lbu_FreeStmt(&s);
-
 abort:
+                // just for escaping from nested cycles
+                ;       /* prevent compiler to complain */
+        }
+
 
        if (parse && !edg_wll_Error(ctx,NULL,NULL))
        {

diff --git a/org.glite.lb.server/src/userjobs.c b/org.glite.lb.server/src/userjobs.c
index d0f7ec0..2566c73 100644 (file)
--- a/org.glite.lb.server/src/userjobs.c
+++ b/org.glite.lb.server/src/userjobs.c
@@ -21,7 +21,7 @@ int edg_wll_UserJobs(
        char    *userid, *stmt = NULL,
                *res = NULL;
        char    *can_peername;
-       int     njobs = 0,ret,i;
+       int     njobs = 0,ret,i,j;
        edg_wlc_JobId   *out = NULL;
        glite_lbu_Statement     sth = NULL;
        edg_wll_ErrorCode       err = 0;