From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7541 invoked by alias); 5 May 2009 13:17:49 -0000 Received: (qmail 7534 invoked by alias); 5 May 2009 13:17:48 -0000 X-SWARE-Spam-Status: No, hits=-0.7 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_33,J_CHICKENPOX_43,J_CHICKENPOX_44,J_CHICKENPOX_74,SPF_HELO_PASS X-Spam-Status: No, hits=-0.7 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_33,J_CHICKENPOX_43,J_CHICKENPOX_44,J_CHICKENPOX_74,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: cluster: STABLE3 - fence agents: fix warnings spotted by paranoia cflags To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 98857b8067d04d691ab544366ee385a982c3a732 X-Git-Newrev: 232031e181ac8b244a92107cd87a9f7a79cfdcd4 From: "Fabio M. Di Nitto" Message-Id: <20090505131727.213E2120154@lists.fedorahosted.org> Date: Tue, 05 May 2009 13:17: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/msg00207.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=232031e181ac8b244a92107cd87a9f7a79cfdcd4 Commit: 232031e181ac8b244a92107cd87a9f7a79cfdcd4 Parent: 98857b8067d04d691ab544366ee385a982c3a732 Author: Fabio M. Di Nitto AuthorDate: Tue May 5 15:16:55 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue May 5 15:16:55 2009 +0200 fence agents: fix warnings spotted by paranoia cflags Signed-off-by: Fabio M. Di Nitto --- fence/agents/ipmilan/ipmilan.c | 20 +++++----- fence/agents/nss_wrapper/fence_nss_wrapper.c | 48 ++++++++++++------------ fence/agents/rackswitch/do_rack.c | 6 +- fence/agents/xvm/fence_xvm.c | 10 ++-- fence/agents/xvm/fence_xvmd.c | 52 +++++++------------------ fence/agents/xvm/ip_lookup.c | 4 +- fence/agents/xvm/options-ccs.c | 5 +-- fence/agents/xvm/options.c | 18 ++++---- fence/agents/xvm/options.h | 21 ++++++---- fence/agents/xvm/simple_auth.c | 6 +- fence/agents/xvm/tcp.c | 1 + fence/agents/xvm/virt.h | 4 +- fence/agents/xvm/vm_states.c | 4 +- fence/agents/xvm/xml.c | 23 ++++++----- 14 files changed, 101 insertions(+), 121 deletions(-) diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c index 74fc415..681ba47 100644 --- a/fence/agents/ipmilan/ipmilan.c +++ b/fence/agents/ipmilan/ipmilan.c @@ -49,7 +49,7 @@ do { \ struct ipmi { - char *i_id; + const char *i_id; const char *i_ipmitool; char *i_host; char *i_user; @@ -119,8 +119,8 @@ static struct Etoken power_status[] = { /* Structure describing one xml metadata value*/ struct xml_parameter_s { - char *name; - char *description; + const char *name; + const char *description; }; /* Array of xml metadatas*/ @@ -175,7 +175,7 @@ ipmitool_path(void) @param max_len Maximum length of data written to dest string (including end 0) @return Pointer to start of destination string. */ -char *str_prepare_for_sh(char *dest,char *source,int max_len) { +static char *str_prepare_for_sh(char *dest,char *source,int max_len) { char *dest_p=dest; char *max_dest=dest+max_len; @@ -577,7 +577,7 @@ ipmi_init(struct ipmi *i, char *host, char *authtype, /** Remove leading and trailing whitespace from a line of text. */ -int +static int cleanup(char *line, size_t linelen) { char *p; @@ -624,7 +624,7 @@ eol: /** Parse args from stdin. Dev + devlen + op + oplen must be valid. */ -int +static int get_options_stdin(char *ip, size_t iplen, char *authtype, size_t atlen, char *passwd, size_t pwlen, @@ -719,14 +719,14 @@ get_options_stdin(char *ip, size_t iplen, /** Print a message to stderr and call exit(1). */ -void -fail_exit(char *msg) +static void +fail_exit(const char *msg) { fprintf(stderr, "failed: %s\n", msg); exit(1); } -void +static void usage_exit(char *pname) { printf("usage: %s \n", pname); @@ -764,7 +764,7 @@ printf(" verbose Same as -v\n\n"); /** Print XML metadata of fence agent*/ -void print_xml_metadata(char *pname) { +static void print_xml_metadata(char *pname) { int i; printf("%s\n",""); diff --git a/fence/agents/nss_wrapper/fence_nss_wrapper.c b/fence/agents/nss_wrapper/fence_nss_wrapper.c index 6a21a12..9571573 100644 --- a/fence/agents/nss_wrapper/fence_nss_wrapper.c +++ b/fence/agents/nss_wrapper/fence_nss_wrapper.c @@ -37,7 +37,7 @@ @param port_s Input port or service name @return port number (converted with ntohs) on success, otherwise -1. */ -int return_port(char *port_s) { +static int return_port(char *port_s) { char *end_c; int res; struct servent *serv; @@ -60,13 +60,13 @@ int return_port(char *port_s) { @param fd socket cased error @return SECSuccess. */ -SECStatus nss_bad_cert_hook(void *arg,PRFileDesc *fd) { +static SECStatus nss_bad_cert_hook(void *arg,PRFileDesc *fd) { return SECSuccess; } /** Display last NSPR/NSS error code and user readable message. */ -void print_nspr_error(void) { +static void print_nspr_error(void) { fprintf(stderr,"Error (%d): %s\n",PR_GetError(),PR_ErrorToString(PR_GetError(),PR_LANGUAGE_I_DEFAULT)); } @@ -74,7 +74,7 @@ void print_nspr_error(void) { domnestic policy. @return 1 on success, otherwise 0. */ -int init_nss(void) { +static int init_nss(void) { if ((NSS_NoDB_Init(NULL)!=SECSuccess) || (NSS_SetDomesticPolicy()!=SECSuccess)) { print_nspr_error(); @@ -92,7 +92,7 @@ int init_nss(void) { @param ipv6 New socket will be IPv4 if this value is 0, otherwise it will be ipv6 @return NULL on error, otherwise socket. */ -PRFileDesc *create_socket(int ssl,int ipv6) { +static PRFileDesc *create_socket(int ssl,int ipv6) { PRFileDesc *res_socket; res_socket=PR_OpenTCPSocket((ipv6?PR_AF_INET6:PR_AF_INET)); @@ -138,15 +138,15 @@ PRFileDesc *create_socket(int ssl,int ipv6) { @param mode Connection mode. Bit-array of MODE_NO_SSL, MODE_IP6MODE, MODE_IP4MODE. @return NULL on error, otherwise connected socket. */ -PRFileDesc *create_connected_socket(char *hostname,int port,int mode) { +static PRFileDesc *create_connected_socket(char *hostname,int port,int mode) { PRAddrInfo *addr_info; void *addr_iter; PRNetAddr addr; - PRFileDesc *socket; + PRFileDesc *localsocket; int can_exit,valid_socket; PRUint16 af_spec; - socket=NULL; + localsocket=NULL; addr_info=NULL; @@ -177,45 +177,45 @@ PRFileDesc *create_connected_socket(char *hostname,int port,int mode) { /*Type of address is what user want, try to create socket and make connection*/ /*Create socket*/ - socket=create_socket(!(mode&MODE_NO_SSL),(PR_NetAddrFamily(&addr)==PR_AF_INET6)); + localsocket=create_socket(!(mode&MODE_NO_SSL),(PR_NetAddrFamily(&addr)==PR_AF_INET6)); - if (socket) { + if (localsocket) { /*Try to connect*/ - if (PR_Connect(socket,&addr,PR_INTERVAL_NO_TIMEOUT)==PR_SUCCESS) { + if (PR_Connect(localsocket,&addr,PR_INTERVAL_NO_TIMEOUT)==PR_SUCCESS) { /*Force handshake*/ - if ((!(mode&MODE_NO_SSL)) && SSL_ForceHandshake(socket)!=SECSuccess) { + if ((!(mode&MODE_NO_SSL)) && SSL_ForceHandshake(localsocket)!=SECSuccess) { /*Handhake failure -> fail*/ print_nspr_error(); - if (PR_Close(socket)!=PR_SUCCESS) { + if (PR_Close(localsocket)!=PR_SUCCESS) { print_nspr_error(); can_exit=1; } - socket=NULL; + localsocket=NULL; } /*Socket is connected -> we can return it*/ can_exit=1; } else { /*Try another address*/ - if (PR_Close(socket)!=PR_SUCCESS) { + if (PR_Close(localsocket)!=PR_SUCCESS) { print_nspr_error(); can_exit=1; } - socket=NULL; + localsocket=NULL; } } } } } - if (!socket) { + if (!localsocket) { /*Socket is unvalid -> we don't found any usable address*/ fprintf(stderr,"Can't connect to host %s on port %d!\n",hostname,port); } PR_FreeAddrInfo(addr_info); - return socket; + return localsocket; } /** Parse arguments from command line. @@ -225,7 +225,7 @@ PRFileDesc *create_connected_socket(char *hostname,int port,int mode) { @param mode Pointer to int will be filled with MODE_DEFAULT, MODE_IP4MODE or MODE_IP4MODE. @return 1 on success, otherwise 0. */ -int parse_cli(int argc,char *argv[],int *operation,int *mode,char **hostname,char **port) { +static int parse_cli(int argc,char *argv[],int *operation,int *mode,char **hostname,char **port) { int opt; *operation=OPERATION_DEFAULT; @@ -280,7 +280,7 @@ int parse_cli(int argc,char *argv[],int *operation,int *mode,char **hostname,cha /** Show usage of application. @param pname Name of program (usually basename of argv[0]) */ -void show_usage(char *pname) { +static void show_usage(char *pname) { printf("usage: %s [options] hostname port\n", pname); printf(" -4 Force to use IPv4\n"); printf(" -6 Force to use IPv6\n"); @@ -298,7 +298,7 @@ void show_usage(char *pname) { shouldn't change this value. After end of file, you may add to this value +100 and call this again, to make sure of proper end (in_buffer can be in this case everything, including NULL). */ -void convert_eols(char *in_buffer,int in_size,char *out_buffer,int *out_size,int *in_state) { +static void convert_eols(char *in_buffer,int in_size,char *out_buffer,int *out_size,int *in_state) { int in_pos,out_pos; int status; char in_char; @@ -346,7 +346,7 @@ void convert_eols(char *in_buffer,int in_size,char *out_buffer,int *out_size,int @param mode Bit-array of MODE_*. This function take care on MODE_RAW. @return 0 on failure, otherwise 1 */ -int poll_cycle(PRFileDesc *socket,int mode) { +static int poll_cycle(PRFileDesc *localsocket,int mode) { PRPollDesc pool[2]; char buffer[1024],buffer_eol[1024*2]; int readed_bytes; @@ -359,7 +359,7 @@ int poll_cycle(PRFileDesc *socket,int mode) { eol_state=0; /* Fill pool*/ - pool[1].fd=socket; + pool[1].fd=localsocket; pool[0].fd=PR_STDIN; pool[0].in_flags=pool[1].in_flags=PR_POLL_READ; pool[0].out_flags=pool[1].out_flags=0; @@ -421,7 +421,7 @@ int poll_cycle(PRFileDesc *socket,int mode) { return 1; } -void atexit_handler(void) { +static void atexit_handler(void) { if (PR_Initialized()) PR_Cleanup(); diff --git a/fence/agents/rackswitch/do_rack.c b/fence/agents/rackswitch/do_rack.c index c1ef1cf..2b5efe2 100644 --- a/fence/agents/rackswitch/do_rack.c +++ b/fence/agents/rackswitch/do_rack.c @@ -1,6 +1,6 @@ #include "do_rack.h" -char *pname = "fence_rack"; +const char *pname = "fence_rack"; int quiet_flag = 0; int verbose_flag = 0; @@ -136,7 +136,7 @@ void ignore_message_status(void) -void print_usage(void) +static void print_usage(void) { printf("Usage:\n"); printf("\n"); @@ -156,7 +156,7 @@ void print_usage(void) -void get_options(int argc, char **argv) +static void get_options(int argc, char **argv) { int c; char *value; diff --git a/fence/agents/xvm/fence_xvm.c b/fence/agents/xvm/fence_xvm.c index ff80361..3191718 100644 --- a/fence/agents/xvm/fence_xvm.c +++ b/fence/agents/xvm/fence_xvm.c @@ -40,7 +40,7 @@ #define LOG_DAEMON_NAME "fence_xvm" -int +static int tcp_wait_connect(int lfd, int retry_tenths) { int fd; @@ -70,7 +70,7 @@ tcp_wait_connect(int lfd, int retry_tenths) } -int +static int tcp_exchange(int fd, fence_auth_type_t auth, void *key, size_t key_len, int timeout) { @@ -118,7 +118,7 @@ tcp_exchange(int fd, fence_auth_type_t auth, void *key, } -int +static int send_multicast_packets(ip_list_t *ipl, fence_xvm_args_t *args, void *key, size_t key_len) { @@ -201,7 +201,7 @@ send_multicast_packets(ip_list_t *ipl, fence_xvm_args_t *args, void *key, /* TODO: Clean this up!!! */ -int +static int fence_xen_domain(fence_xvm_args_t *args) { ip_list_t ipl; @@ -310,7 +310,7 @@ int main(int argc, char **argv) { fence_xvm_args_t args; - char *my_options = "di:a:p:T:r:C:c:k:H:uo:t:?hV"; + const char *my_options = "di:a:p:T:r:C:c:k:H:uo:t:?hV"; /* Print to stderr. Fenced will report our output for us */ logt_init(LOG_DAEMON_NAME, LOG_MODE_OUTPUT_STDERR, diff --git a/fence/agents/xvm/fence_xvmd.c b/fence/agents/xvm/fence_xvmd.c index 8fd35cf..f2199d7 100644 --- a/fence/agents/xvm/fence_xvmd.c +++ b/fence/agents/xvm/fence_xvmd.c @@ -47,9 +47,9 @@ static int reload_key; #define LOG_MODE_DEFAULT LOG_MODE_OUTPUT_SYSLOG|LOG_MODE_OUTPUT_FILE static int log_mode_default = LOG_MODE_DEFAULT; -int cleanup_xml(char *xmldesc, char **ret, size_t *retsz); +extern int cleanup_xml(char *xmldesc, char **ret, size_t *retsz); -int +static int connect_tcp(fence_req_t *req, fence_auth_type_t auth, void *key, size_t key_len) { @@ -110,7 +110,7 @@ connect_tcp(fence_req_t *req, fence_auth_type_t auth, } -int +static int do_notify_caller_tcp(fence_req_t *req, fence_auth_type_t auth, void *key, size_t key_len, char response) { @@ -132,24 +132,6 @@ out: return -1; } - -void -raise_error(virConnectPtr vp) -{ - virErrorPtr vep; - - vep = virConnGetLastError(vp); - if (!vep) { - logt_print(LOG_ERR, - "Error: Unable to retrieve error from connection!\n"); - return; - } - - logt_print(LOG_ERR, "Error: libvirt #%d domain %d: %s\n", vep->code, - vep->domain, vep->message); -} - - static inline virDomainPtr get_domain(fence_req_t *req, virConnectPtr vp) { @@ -210,7 +192,7 @@ wait_domain(fence_req_t *req, virConnectPtr vp, int timeout) -int +static int do_fence_request_tcp(fence_req_t *req, fence_auth_type_t auth, void *key, size_t key_len, virConnectPtr vp, int flags) @@ -363,7 +345,7 @@ out: } -int +static int virt_list_update(virConnectPtr vp, virt_list_t **vl, int my_id) { virt_list_t *list = NULL; @@ -380,7 +362,7 @@ virt_list_update(virConnectPtr vp, virt_list_t **vl, int my_id) } -int +static int get_cman_ids(cman_handle_t ch, int *my_id, int *high_id) { int max_nodes; @@ -439,7 +421,7 @@ out: } -int +static int get_domain_state_ckpt(void *hp, unsigned char *domain, vm_state_t *state) { errno = EINVAL; @@ -453,7 +435,7 @@ get_domain_state_ckpt(void *hp, unsigned char *domain, vm_state_t *state) } -void +static void store_domains_by_name(void *hp, virt_list_t *vl) { int x; @@ -472,7 +454,7 @@ store_domains_by_name(void *hp, virt_list_t *vl) } -void +static void store_domains_by_uuid(void *hp, virt_list_t *vl) { int x; @@ -573,7 +555,7 @@ handle_remote_domain(cman_handle_t ch, void *h, fence_req_t *data, } -int +static int xvmd_loop(cman_handle_t ch, void *h, int fd, fence_xvm_args_t *args, void *key, size_t key_len) { @@ -741,21 +723,19 @@ xvmd_loop(cman_handle_t ch, void *h, int fd, fence_xvm_args_t *args, } -void +static void sigint_handler(int sig) { running = 0; } -void +static void sighup_handler(int sig) { reload_key = 1; } -void malloc_dump_table(void); - -int +static int ccs_read_old_logging(int ccsfd, int *facility, int *priority) { char query[256]; @@ -794,7 +774,7 @@ ccs_read_old_logging(int ccsfd, int *facility, int *priority) } -void +static void conf_logging(int debug, int logmode, int facility, int loglevel, int filelevel, char *fname) { @@ -863,7 +843,7 @@ main(int argc, char **argv) { fence_xvm_args_t args; char key[MAX_KEY_LEN]; - char *my_options = "dfi:a:p:I:C:U:c:k:u?hLXV"; + const char *my_options = "dfi:a:p:I:C:U:c:k:u?hLXV"; void *h = NULL; char *dbgp = getenv("FENCE_XVMD_DEBUG"); cman_handle_t ch = NULL; @@ -1006,8 +986,6 @@ main(int argc, char **argv) signal(SIGQUIT, sigint_handler); xvmd_loop(ch, h, mc_sock, &args, key, key_len); - //malloc_dump_table(); - return 0; out_fail: diff --git a/fence/agents/xvm/ip_lookup.c b/fence/agents/xvm/ip_lookup.c index e70675c..3867c52 100644 --- a/fence/agents/xvm/ip_lookup.c +++ b/fence/agents/xvm/ip_lookup.c @@ -154,7 +154,7 @@ add_ip_addresses(int family, ip_list_t *ipl) continue; } - rta = (struct rtattr *)((void *)ifa + sizeof(*ifa)); + rta = (struct rtattr *)((char *)ifa + sizeof(*ifa)); len -= sizeof(*ifa); do { /* Make sure we've got a valid rtaddr field */ @@ -178,7 +178,7 @@ add_ip_addresses(int family, ip_list_t *ipl) if (!nrta) break; - len -= ((void *)nrta - (void *)rta); + len -= ((char *)nrta - (char *)rta); rta = nrta; } while (RTA_OK(rta, len)); diff --git a/fence/agents/xvm/options-ccs.c b/fence/agents/xvm/options-ccs.c index 0384aee..01ca051 100644 --- a/fence/agents/xvm/options-ccs.c +++ b/fence/agents/xvm/options-ccs.c @@ -26,9 +26,6 @@ #include -struct arg_info *find_arg_by_char(char arg); -struct arg_info *find_arg_by_string(char *arg); - extern int _debug; /** @@ -39,7 +36,7 @@ extern int _debug; @param args Args structure to fill in. */ void -args_get_ccs(char *optstr, fence_xvm_args_t *args) +args_get_ccs(const char *optstr, fence_xvm_args_t *args) { char buf[256]; int ccsfd = -1, x, n; diff --git a/fence/agents/xvm/options.c b/fence/agents/xvm/options.c index 15d80b6..4a92179 100644 --- a/fence/agents/xvm/options.c +++ b/fence/agents/xvm/options.c @@ -480,7 +480,7 @@ args_print(fence_xvm_args_t *args) 1 = print fence-style stdin args + description */ void -args_usage(char *progname, char *optstr, int print_stdin) +args_usage(char *progname, const char *optstr, int print_stdin) { int x; struct arg_info *arg; @@ -513,9 +513,9 @@ args_usage(char *progname, char *optstr, int print_stdin) static void -print_desc_xml(char *desc) +print_desc_xml(const char *desc) { - char *d; + const char *d; for (d = desc; *d; d++) { switch (*d) { @@ -533,7 +533,7 @@ print_desc_xml(char *desc) void -args_metadata(char *progname, char *optstr) +args_metadata(char *progname, const char *optstr) { int x; struct arg_info *arg; @@ -568,7 +568,7 @@ args_metadata(char *progname, char *optstr) @param linelen Max size of line @return 0 on success, -1 on failure */ -int +static int cleanup(char *line, size_t linelen) { char *p; @@ -619,7 +619,7 @@ eol: @param args Args structure to fill in. */ void -args_get_stdin(char *optstr, fence_xvm_args_t *args) +args_get_stdin(const char *optstr, fence_xvm_args_t *args) { char in[256]; int line = 0; @@ -664,7 +664,7 @@ args_get_stdin(char *optstr, fence_xvm_args_t *args) @param args Args structure to fill in. */ void -args_get_getopt(int argc, char **argv, char *optstr, fence_xvm_args_t *args) +args_get_getopt(int argc, char **argv, const char *optstr, fence_xvm_args_t *args) { int opt; struct arg_info *arg; @@ -687,7 +687,7 @@ args_get_getopt(int argc, char **argv, char *optstr, fence_xvm_args_t *args) void args_finalize(fence_xvm_args_t *args) { - char *addr = NULL; + const char *addr = NULL; if (!args->addr) { switch(args->family) { @@ -705,7 +705,7 @@ args_finalize(fence_xvm_args_t *args) } if (!args->addr) - args->addr = addr; + args->addr = strdup(addr); if (!args->addr) { printf("No multicast address available\n"); diff --git a/fence/agents/xvm/options.h b/fence/agents/xvm/options.h index b13cf9b..1bf9955 100644 --- a/fence/agents/xvm/options.h +++ b/fence/agents/xvm/options.h @@ -36,10 +36,10 @@ typedef struct { /* Private structure for commandline / stdin fencing args */ struct arg_info { - char opt; - char *opt_desc; - char *stdin_opt; - char *desc; + const char opt; + const char *opt_desc; + const char *stdin_opt; + const char *desc; void (*assign)(fence_xvm_args_t *, struct arg_info *, char *); }; @@ -48,12 +48,15 @@ struct arg_info { void args_init(fence_xvm_args_t *args); void args_finalize(fence_xvm_args_t *args); -void args_get_getopt(int argc, char **argv, char *optstr, +void args_get_getopt(int argc, char **argv, const char *optstr, fence_xvm_args_t *args); -void args_get_stdin(char *optstr, fence_xvm_args_t *args); -void args_get_ccs(char *optstr, fence_xvm_args_t *args); -void args_usage(char *progname, char *optstr, int print_stdin); -void args_metadata(char *progname, char *optstr); +void args_get_stdin(const char *optstr, fence_xvm_args_t *args); +void args_get_ccs(const char *optstr, fence_xvm_args_t *args); +void args_usage(char *progname, const char *optstr, int print_stdin); +void args_metadata(char *progname, const char *optstr); void args_print(fence_xvm_args_t *args); +struct arg_info *find_arg_by_char(char arg); +struct arg_info *find_arg_by_string(char *arg); + #endif diff --git a/fence/agents/xvm/simple_auth.c b/fence/agents/xvm/simple_auth.c index 9e0e114..2d9b2e7 100644 --- a/fence/agents/xvm/simple_auth.c +++ b/fence/agents/xvm/simple_auth.c @@ -13,7 +13,7 @@ #include "simple_auth.h" #include "debug.h" -void +static void print_hash(unsigned char *hash, size_t hashlen) { int x; @@ -167,7 +167,7 @@ verify_request(fence_req_t *req, fence_hash_t min, } -int +static int sha_challenge(int fd, fence_auth_type_t auth, void *key, size_t key_len, int timeout) { @@ -250,7 +250,7 @@ sha_challenge(int fd, fence_auth_type_t auth, void *key, } -int +static int sha_response(int fd, fence_auth_type_t auth, void *key, size_t key_len, int timeout) { diff --git a/fence/agents/xvm/tcp.c b/fence/agents/xvm/tcp.c index a09ebd2..46aa844 100644 --- a/fence/agents/xvm/tcp.c +++ b/fence/agents/xvm/tcp.c @@ -14,6 +14,7 @@ #include #include +#include "tcp.h" #include "debug.h" static int connect_nb(int fd, struct sockaddr *dest, socklen_t len, int timeout); diff --git a/fence/agents/xvm/virt.h b/fence/agents/xvm/virt.h index ce57c9d..f70a0da 100644 --- a/fence/agents/xvm/virt.h +++ b/fence/agents/xvm/virt.h @@ -50,12 +50,10 @@ void vl_free(virt_list_t *old); virt_state_t * vl_find_uuid(virt_list_t *vl, char *name); virt_state_t * vl_find_name(virt_list_t *vl, char *name); - -typedef void ckpt_handle; int ckpt_read(void *hp, char *secid, void *buf, size_t maxlen); int ckpt_finish(void *hp); int ckpt_write(void *hp, char *secid, void *buf, size_t maxlen); -void *ckpt_init(char *ckpt_name, int maxlen, int maxsec, int maxseclen, +void *ckpt_init(const char *ckpt_name, int maxlen, int maxsec, int maxseclen, int timeout); diff --git a/fence/agents/xvm/vm_states.c b/fence/agents/xvm/vm_states.c index 5468ff3..68272c6 100644 --- a/fence/agents/xvm/vm_states.c +++ b/fence/agents/xvm/vm_states.c @@ -15,6 +15,8 @@ #include #include +#include "virt.h" + typedef struct { uint32_t ck_ready; int ck_timeout; @@ -198,7 +200,7 @@ good: void * -ckpt_init(char *ckpt_name, int maxlen, int maxsec, +ckpt_init(const char *ckpt_name, int maxlen, int maxsec, int maxseclen, int timeout) { ckpt_handle *h; diff --git a/fence/agents/xvm/xml.c b/fence/agents/xvm/xml.c index 8868e64..2ed4a96 100644 --- a/fence/agents/xvm/xml.c +++ b/fence/agents/xvm/xml.c @@ -8,15 +8,15 @@ #include #include - #ifdef STANDALONE #define dbg_printf(x, fmt, args...) printf("<%d> " fmt, x, ##args) #else #include "debug.h" #endif +int cleanup_xml(char *xmldesc, char **ret, size_t *retsz); -xmlNodePtr +static xmlNodePtr get_os_node(xmlDocPtr doc) { xmlNodePtr node; @@ -35,7 +35,7 @@ get_os_node(xmlDocPtr doc) } -int +static int flip_graphics_port(xmlDocPtr doc) { xmlNodePtr node, curr; @@ -67,7 +67,7 @@ flip_graphics_port(xmlDocPtr doc) } -int +static int cleanup_xml_doc(xmlDocPtr doc) { xmlNodePtr os_node, curr; @@ -118,8 +118,8 @@ cleanup_xml_doc(xmlDocPtr doc) return 0; } - -int +#ifdef STANDALONE +static int xtree_readfile(const char *filename, xmlDocPtr *xtreep) { xmlNodePtr cur; @@ -140,9 +140,10 @@ xtree_readfile(const char *filename, xmlDocPtr *xtreep) return 0; } +#endif -int +static int xtree_readbuffer(const char *buffer, size_t size, xmlDocPtr *xtreep) { xmlNodePtr cur; @@ -167,8 +168,8 @@ xtree_readbuffer(const char *buffer, size_t size, xmlDocPtr *xtreep) return 0; } - -int +#ifdef STANDALONE +static int xtree_writefile(const char *filename, xmlDocPtr xtree) { char tmpfn[1024]; @@ -244,9 +245,9 @@ xtree_writefile(const char *filename, xmlDocPtr xtree) close(tmpfd); return 0; } +#endif - -int +static int xtree_writebuffer(xmlDocPtr xtree, char **buffer, size_t *size) { *size = 0;