From: Michal Voců Date: Wed, 1 Apr 2009 21:41:33 +0000 (+0000) Subject: fix build X-Git-Tag: glite-lb_R_2_0_2_2~11 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a70de1b7f27c8bba968a465ba370ccdfce7c86e5;p=jra1mw.git fix build --- diff --git a/org.glite.lb.logger/src/event_store.c b/org.glite.lb.logger/src/event_store.c index 0c98382..60c6fd6 100644 --- a/org.glite.lb.logger/src/event_store.c +++ b/org.glite.lb.logger/src/event_store.c @@ -102,7 +102,7 @@ fname2index(const char *filename) if(p == NULL) return 0; - for(s = p+1; *s != NULL; s++) { + for(s = p+1; *s != 0; s++) { if(*s < '0' || *s > '9') { return 0; } @@ -996,7 +996,7 @@ event_store_clean(struct event_store *es) * -------------------------------- */ struct event_store * -event_store_find(char *job_id_s, const char *filename = NULL) +event_store_find(char *job_id_s, const char *filename) { struct event_store_list *q, *p, *d; struct event_store *es; diff --git a/org.glite.lb.logger/src/il_master.c b/org.glite.lb.logger/src/il_master.c index c3b0307..29c04c5 100644 --- a/org.glite.lb.logger/src/il_master.c +++ b/org.glite.lb.logger/src/il_master.c @@ -180,7 +180,7 @@ handle_cmd(il_octet_string_t *event, long offset) /* catchup with all neccessary event files */ if(job_id_s) { - struct event_store *es = event_store_find(job_id_s); + struct event_store *es = event_store_find(job_id_s, NULL); if(es == NULL) { goto cmd_error; @@ -356,7 +356,7 @@ handle_msg(il_octet_string_t *event, long offset) /* sync event store with IPC (if neccessary) * This MUST be called before inserting event into output queue! */ - if((es = event_store_find(msg->job_id_s)) == NULL) + if((es = event_store_find(msg->job_id_s, NULL)) == NULL) return(-1); msg->es = es; diff --git a/org.glite.lb.logger/src/interlogd.h b/org.glite.lb.logger/src/interlogd.h index 0a13297..834da53 100644 --- a/org.glite.lb.logger/src/interlogd.h +++ b/org.glite.lb.logger/src/interlogd.h @@ -246,7 +246,7 @@ int notifid_map_set_expiration(const char *, time_t); int event_store_init(char *); int event_store_cleanup(); int event_store_recover_all(void); -struct event_store *event_store_find(char *, const char * = NULL); +struct event_store *event_store_find(char *, const char *); int event_store_sync(struct event_store *, long); int event_store_next(struct event_store *, long, int); int event_store_commit(struct event_store *, int, int, int);