From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27724 invoked by alias); 22 Jun 2009 16:54:15 -0000 Received: (qmail 27717 invoked by alias); 22 Jun 2009 16:54:15 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: rgmanager: master - rgmanager: Fix daemon_init related warnings To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: rgmanager.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 5255b217d9d58c17dfb9121588150787a41a8491 X-Git-Newrev: 32605773b7c5f40f802d3b8ebc5887b8952a2305 From: Lon Hohberger Message-Id: <20090622165342.37A1512025B@lists.fedorahosted.org> Date: Mon, 22 Jun 2009 16:54:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00629.txt.bz2 Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=32605773b7c5f40f802d3b8ebc5887b8952a2305 Commit: 32605773b7c5f40f802d3b8ebc5887b8952a2305 Parent: 5255b217d9d58c17dfb9121588150787a41a8491 Author: Lon Hohberger AuthorDate: Fri May 29 10:15:21 2009 -0400 Committer: Lon Hohberger CommitterDate: Mon Jun 22 12:49:27 2009 -0400 rgmanager: Fix daemon_init related warnings Signed-off-by: Lon Hohberger --- rgmanager/include/daemon_init.h | 9 +++++++++ rgmanager/src/clulib/daemon_init.c | 8 +------- rgmanager/src/daemons/main.c | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/rgmanager/include/daemon_init.h b/rgmanager/include/daemon_init.h new file mode 100644 index 0000000..0252386 --- /dev/null +++ b/rgmanager/include/daemon_init.h @@ -0,0 +1,9 @@ +#ifndef _DAEMON_INIT_H +#define _DAEMON_INIT_H + +int check_pid_valid(pid_t pid, char *prog); +int check_process_running(char *prog, pid_t * pid); +void daemon_init(char *prog); +void daemon_cleanup(void); + +#endif diff --git a/rgmanager/src/clulib/daemon_init.c b/rgmanager/src/clulib/daemon_init.c index bbf7d48..e9adeed 100644 --- a/rgmanager/src/clulib/daemon_init.c +++ b/rgmanager/src/clulib/daemon_init.c @@ -25,13 +25,7 @@ #include #include #include - -/* - * This should ultimately go in a header file. - */ -void daemon_init(char *prog); -int check_pid_valid(pid_t pid, char *prog); -int check_process_running(char *prog, pid_t * pid); +#include /* * Local prototypes. diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 7ae7020..e4800cb 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -18,6 +18,7 @@ #include #include #include +#include #define L_SHUTDOWN (1<<2) #define L_SYS (1<<1) @@ -31,7 +32,6 @@ void set_transition_throttling(int); void node_event(int, int, int, int); void node_event_q(int, int, int, int); -int daemon_init(char *); void daemon_cleanup(void); void kill_resource_groups(void); void flag_shutdown(int sig);