fix typo and condition logic

diff --git a/org.glite.lb.logger/src/event_queue.c b/org.glite.lb.logger/src/event_queue.c
index 4939f1c..3d537d9 100644 (file)
--- a/org.glite.lb.logger/src/event_queue.c
+++ b/org.glite.lb.logger/src/event_queue.c
@@ -312,7 +312,7 @@ event_queue_move_events(struct event_queue *eq_s,
                        /* remove the message from the source list */
                        *source_prev = p->prev;
                        assert(eq_s->cur_len > 0);
-                       es_s->cur_len--;
+                       eq_s->cur_len--;
                        if(eq_d) {
                                /* append the message at the end of destination list */
                                p->prev = NULL;

diff --git a/org.glite.lb.logger/src/event_store.c b/org.glite.lb.logger/src/event_store.c
index edfd08c..7fa8e64 100644 (file)
--- a/org.glite.lb.logger/src/event_store.c
+++ b/org.glite.lb.logger/src/event_store.c
@@ -787,7 +787,7 @@ event_store_recover(struct event_store *es)
 
       il_log(LOG_DEBUG, "      queuing event at %ld to bookkeeping server\n", last);
 
-      if(r=enqueue_msg(eq_b, msg) < 0) {
+      if((r=enqueue_msg(eq_b, msg)) < 0) {
          break;
       } else if(r > 0) {
              throttle = 1;

diff --git a/org.glite.lb.logger/src/il_master.c b/org.glite.lb.logger/src/il_master.c
index bf4d026..476db17 100644 (file)
--- a/org.glite.lb.logger/src/il_master.c
+++ b/org.glite.lb.logger/src/il_master.c
@@ -37,7 +37,7 @@ enqueue_msg(struct event_queue *eq, struct server_msg *msg)
        event_queue_cond_lock(eq);
 
        /* insert new event */
-       if(ret = event_queue_insert(eq, msg) < 0) {
+       if((ret = event_queue_insert(eq, msg)) < 0) {
                event_queue_cond_unlock(eq);
                return ret;
        }