Send Linux-ha-cvs mailing list submissions to
        [email protected]

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."


Today's Topics:

   1. Linux-HA CVS: lib by andrew from 
      ([email protected])
   2. Linux-HA CVS: replace by davidlee from 
      ([email protected])
   3. Linux-HA CVS: linux-ha by davidlee from 
      ([email protected])


----------------------------------------------------------------------

Message: 1
Date: Fri,  7 Apr 2006 09:48:13 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : andrew
Host    : 
Project : linux-ha
Module  : lib

Dir     : linux-ha/lib/clplumbing


Modified Files:
        GSource.c 


Log Message:
Address issues raised by coverity
 - g_assert() doesn't actually change the execution flow.  It just complains
   and keeps going.

===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/GSource.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- GSource.c   6 Apr 2006 10:45:49 -0000       1.81
+++ GSource.c   7 Apr 2006 15:48:12 -0000       1.82
@@ -1,4 +1,4 @@
-/* $Id: GSource.c,v 1.81 2006/04/06 10:45:49 andrew Exp $ */
+/* $Id: GSource.c,v 1.82 2006/04/07 15:48:12 andrew Exp $ */
 /*
  * Copyright (c) 2002 Alan Robertson <[EMAIL PROTECTED]>
  *
@@ -1008,8 +1008,11 @@
        if (sig_src->gsourceid <= 0) {
                return FALSE;
        }
-       g_assert(_NSIG > sig_src->signal);
-
+       if(_NSIG <= sig_src->signal) {
+               g_assert(_NSIG > sig_src->signal);
+               return FALSE;
+       }
+       
        CL_SIGNAL(sig_src->signal, NULL);
 
        sig_src->gsourceid = 0;
@@ -1144,8 +1147,14 @@
        static struct tms       dummy_tms_struct;
        GSIGSource* sig_src = NULL;
 
-       g_assert(G_main_signal_list != NULL);
-       g_assert(_NSIG > nsig);
+       if(G_main_signal_list == NULL) {
+               g_assert(G_main_signal_list != NULL);
+               return;
+       }
+       if(_NSIG <= nsig) {
+               g_assert(_NSIG > nsig);
+               return;
+       }
        
        sig_src = G_main_signal_list[nsig];
 




------------------------------

Message: 2
Date: Fri,  7 Apr 2006 09:49:03 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: replace by davidlee from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : davidlee
Host    : 
Project : linux-ha
Module  : replace

Dir     : linux-ha/replace


Modified Files:
        daemon.c 


Log Message:
Fix a compilation warning when 'replace/daemon.c' is required
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/replace/daemon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- daemon.c    17 Feb 2004 22:12:01 -0000      1.2
+++ daemon.c    7 Apr 2006 15:49:03 -0000       1.3
@@ -1,4 +1,4 @@
-/* $Id: daemon.c,v 1.2 2004/02/17 22:12:01 lars Exp $ */
+/* $Id: daemon.c,v 1.3 2006/04/07 15:49:03 davidlee Exp $ */
 /*-
  *
  * daemon - replacement for daemon function.
@@ -47,6 +47,8 @@
 static char sccsid[] = "@(#)daemon.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
+#include <portability.h>
+
 #include <fcntl.h>
 #include <unistd.h>
 




------------------------------

Message: 3
Date: Fri,  7 Apr 2006 09:49:04 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : davidlee
Host    : 
Module  : linux-ha

Dir     : linux-ha/linux-ha


Modified Files:
        portability.h 


Log Message:
Fix a compilation warning when 'replace/daemon.c' is required
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/linux-ha/portability.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- portability.h       30 Jan 2006 18:41:59 -0000      1.51
+++ portability.h       7 Apr 2006 15:49:03 -0000       1.52
@@ -1,4 +1,4 @@
-/* $Id: portability.h,v 1.51 2006/01/30 18:41:59 alan Exp $ */
+/* $Id: portability.h,v 1.52 2006/04/07 15:49:03 davidlee Exp $ */
 #ifndef PORTABILITY_H
 #  define PORTABILITY_H
 
@@ -60,6 +60,11 @@
 #      define  NETSNMP_NO_INLINE 1
 #endif
 
+#ifndef HA_HAVE_DAEMON
+  /* We supply a replacement function, but need a prototype */
+int daemon(int nochdir, int noclose);
+#endif /* HA_HAVE_DAEMON */
+
 #ifndef HA_HAVE_SETENV
   /* We supply a replacement function, but need a prototype */
 int setenv(const char *name, const char * value, int why);




------------------------------

_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs


End of Linux-ha-cvs Digest, Vol 29, Issue 39
********************************************

Reply via email to