From 387d9e485546a4f7e02e89fdcd097e700cf9ca81 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 18 Feb 2012 12:35:16 +0100 Subject: examples: Fix sparse warnings in sshd examples. --- examples/samplesshd-kbdint.c | 14 +++++++------- examples/samplesshd.c | 12 +++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/examples/samplesshd-kbdint.c b/examples/samplesshd-kbdint.c index b1eaad7..faecfd9 100644 --- a/examples/samplesshd-kbdint.c +++ b/examples/samplesshd-kbdint.c @@ -36,8 +36,8 @@ clients must be made or how a client should react. #endif #ifdef WITH_PCAP -const char *pcap_file="debug.server.pcap"; -ssh_pcap_file pcap; +static const char *pcap_file = "debug.server.pcap"; +static ssh_pcap_file pcap; static void set_pcap(ssh_session session){ if(!pcap_file) @@ -52,7 +52,7 @@ static void set_pcap(ssh_session session){ ssh_set_pcap_file(session,pcap); } -static void cleanup_pcap(){ +static void cleanup_pcap(void) { ssh_pcap_file_free(pcap); pcap=NULL; } @@ -172,10 +172,10 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) { static struct argp argp = {options, parse_opt, args_doc, doc, NULL, NULL, NULL}; #endif /* HAVE_ARGP_H */ -const char *name; -const char *instruction; -const char *prompts[2]; -char echo[] = { 1, 0 }; +static const char *name; +static const char *instruction; +static const char *prompts[2]; +static char echo[] = { 1, 0 }; static int kbdint_check_response(ssh_session session) { int count; diff --git a/examples/samplesshd.c b/examples/samplesshd.c index 8000448..c5a0ef0 100644 --- a/examples/samplesshd.c +++ b/examples/samplesshd.c @@ -33,11 +33,10 @@ clients must be made or how a client should react. #endif #ifdef WITH_PCAP -const char *pcap_file="debug.server.pcap"; -ssh_pcap_file pcap; +static const char *pcap_file="debug.server.pcap"; +static ssh_pcap_file pcap; -void set_pcap(ssh_session session); -void set_pcap(ssh_session session){ +static void set_pcap(ssh_session session) { if(!pcap_file) return; pcap=ssh_pcap_file_new(); @@ -50,8 +49,7 @@ void set_pcap(ssh_session session){ ssh_set_pcap_file(session,pcap); } -void cleanup_pcap(void); -void cleanup_pcap(){ +static void cleanup_pcap(void) { ssh_pcap_file_free(pcap); pcap=NULL; } @@ -118,7 +116,7 @@ static struct argp_option options[] = { .doc = "Get verbose output.", .group = 0 }, - {NULL, 0, 0, 0, NULL, 0} + {NULL, 0, NULL, 0, NULL, 0} }; /* Parse a single option. */ -- cgit v1.2.3