fixed warnings when compiled with -Wmissing-declarations

svn path=/trunk/; revision=18297
This commit is contained in:
Thomas Bluemel 2005-10-06 18:51:52 +00:00
parent 611d7cf177
commit 0c48b5f905
19 changed files with 170 additions and 167 deletions

View file

@ -74,7 +74,6 @@ int lflag, mflag, pplan, sflag;
static void userlist(int, char **); static void userlist(int, char **);
void usage(); void usage();
void netfinger(char *);
int int
main(int argc, char **argv) main(int argc, char **argv)

View file

@ -42,6 +42,8 @@ static char sccsid[] = "@(#)getopt.c 4.13 (Berkeley) 2/23/91";
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "getopt.h"
/* /*
* get option letter from argument vector * get option letter from argument vector
*/ */

View file

@ -31,4 +31,6 @@ typedef long uid_t; // SunOS 5.5
#define index(s, c) strchr(s, c) #define index(s, c) strchr(s, c)
#define rindex(s, c) strrchr(s, c) #define rindex(s, c) strrchr(s, c)
void netfinger(char *);
#endif #endif

View file

@ -46,7 +46,6 @@ static char sccsid[] = "@(#)cmds.c 5.18 (Berkeley) 4/20/89";
#include "prototypes.h" #include "prototypes.h"
extern char *globerr; extern char *globerr;
extern char **glob();
extern char home[]; extern char home[];
extern char *remglob(); extern char *remglob();
extern char *getenv(); extern char *getenv();
@ -67,7 +66,7 @@ extern int autologin;
*/ */
void setpeer(int argc, char *argv[]) void setpeer(int argc, char *argv[])
{ {
char *host, *hookup(); char *host;
if (connected) { if (connected) {
printf("Already connected to %s, use close first.\n", printf("Already connected to %s, use close first.\n",
@ -266,9 +265,9 @@ void setebcdic()
/* /*
* Set file transfer mode. * Set file transfer mode.
*/ */
#if 0
/*ARGSUSED*/ /*ARGSUSED*/
void setmode(argc, argv) void fsetmode(argc, argv)
char *argv[]; char *argv[];
{ {
@ -276,7 +275,7 @@ void setmode(argc, argv)
(void) fflush(stdout); (void) fflush(stdout);
code = -1; code = -1;
} }
#endif
/* /*
* Set file transfer format. * Set file transfer format.
@ -379,7 +378,6 @@ void mput(argc, argv)
{ {
register int i; register int i;
int ointer; int ointer;
void mabort();
extern jmp_buf jabort; extern jmp_buf jabort;
char *tp; char *tp;
@ -650,7 +648,8 @@ usage:
return (0); return (0);
} }
void #if 0
static void
mabort() mabort()
{ {
int ointer; int ointer;
@ -670,6 +669,7 @@ mabort()
mflag = 0; mflag = 0;
longjmp(jabort,0); longjmp(jabort,0);
} }
#endif
/* /*
* Get multiple files. * Get multiple files.
@ -679,7 +679,6 @@ void mget(argc, argv)
{ {
char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN]; char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN];
int ointer; int ointer;
void mabort();
extern jmp_buf jabort; extern jmp_buf jabort;
if (argc < 2) { if (argc < 2) {
@ -809,7 +808,7 @@ remglob(argv,doswitch)
return (buf); return (buf);
} }
char * static char *
onoff(bool) onoff(bool)
int bool; int bool;
{ {
@ -1094,7 +1093,6 @@ void mdelete(argc, argv)
{ {
char *cp; char *cp;
int ointer; int ointer;
void mabort();
extern jmp_buf jabort; extern jmp_buf jabort;
if (argc < 2) { if (argc < 2) {
@ -1217,7 +1215,6 @@ void mls(argc, argv)
{ {
char *cmd, mode[1], *dest; char *cmd, mode[1], *dest;
int ointer, i; int ointer, i;
void mabort();
extern jmp_buf jabort; extern jmp_buf jabort;
if (argc < 2) { if (argc < 2) {
@ -1276,7 +1273,7 @@ void mls(argc, argv)
* Do a shell escape * Do a shell escape
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
int shell(argc, argv) void shell(argc, argv)
char *argv[]; char *argv[];
{ {
#if 0 #if 0
@ -1344,7 +1341,7 @@ int shell(argc, argv)
if (NumBytes == 0) if (NumBytes == 0)
{ {
return(-1); return;
} }
AppName = ShellCmd; AppName = ShellCmd;
@ -1391,21 +1388,12 @@ int shell(argc, argv)
CloseHandle( ProcessInformation.hProcess); CloseHandle( ProcessInformation.hProcess);
} }
if (Result)
{
return(-1);
}
else
{
return(0);
}
} }
/* /*
* Send new user information (re-login) * Send new user information (re-login)
*/ */
int user(argc, argv) void user(argc, argv)
int argc; int argc;
char **argv; char **argv;
{ {
@ -1425,7 +1413,7 @@ int user(argc, argv)
printf("usage: %s username [password] [account]\n", argv[0]); printf("usage: %s username [password] [account]\n", argv[0]);
(void) fflush(stdout); (void) fflush(stdout);
code = -1; code = -1;
return (0); return;
} }
n = command("USER %s", argv[1]); n = command("USER %s", argv[1]);
if (n == CONTINUE) { if (n == CONTINUE) {
@ -1447,12 +1435,11 @@ int user(argc, argv)
if (n != COMPLETE) { if (n != COMPLETE) {
fprintf(stdout, "Login failed.\n"); fprintf(stdout, "Login failed.\n");
(void) fflush(stdout); (void) fflush(stdout);
return (0); return;
} }
if (!aflag && argc == 4) { if (!aflag && argc == 4) {
(void) command("ACCT %s", argv[3]); (void) command("ACCT %s", argv[3]);
} }
return (1);
} }
/* /*
@ -1717,13 +1704,15 @@ int confirm(cmd, file)
return (*line != 'n' && *line != 'N'); return (*line != 'n' && *line != 'N');
} }
void fatal(msg) #if 0
static void fatal(msg)
char *msg; char *msg;
{ {
fprintf(stderr, "ftp: %s\n", msg); fprintf(stderr, "ftp: %s\n", msg);
exit(1); exit(1);
} }
#endif
/* /*
* Glob a local file name specification with * Glob a local file name specification with
@ -1785,7 +1774,8 @@ void account(argc,argv)
jmp_buf abortprox; jmp_buf abortprox;
void #if 0
static void
proxabort() proxabort()
{ {
extern int proxy; extern int proxy;
@ -1802,12 +1792,12 @@ proxabort()
pswitch(0); pswitch(0);
longjmp(abortprox,1); longjmp(abortprox,1);
} }
#endif
void doproxy(argc,argv) void doproxy(argc,argv)
int argc; int argc;
char *argv[]; char *argv[];
{ {
void proxabort();
register struct cmd *c; register struct cmd *c;
struct cmd *getcmd(); struct cmd *getcmd();
// extern struct cmd cmdtab[]; // extern struct cmd cmdtab[];

View file

@ -24,20 +24,6 @@ static char sccsid[] = "@(#)cmdtab.c 5.9 (Berkeley) 3/21/89";
/* /*
* User FTP -- Command Tables. * User FTP -- Command Tables.
*/ */
int setascii(), setbell(), setbinary(), setdebug(), setform();
int setglob(), sethash(), setmode(), setpeer(), setpassive(), setport();
int setprompt(), setstruct();
int settenex(), settrace(), settype(), setverbose();
int disconnect(), restart(), reget(), syst();
int cd(), lcd(), delete(), mdelete(), user();
int ls(), mls(), get(), mget(), help(), append(), put(), mput();
int quit(), renamefile(), status();
int quote(), rmthelp(), shell(), site();
int pwd(), makedir(), removedir(), setcr();
int account(), doproxy(), reset(), setcase(), setntrans(), setnmap();
int setsunique(), setrunique(), cdup(), macdef(), domacro();
int sizecmd(), modtime(), newer(), rmtstatus();
int do_chmod(), do_umask(), idle();
char accounthelp[] = "send account command to remote server"; char accounthelp[] = "send account command to remote server";
char appendhelp[] = "append to a file"; char appendhelp[] = "append to a file";
@ -140,7 +126,7 @@ struct cmd cmdtab[] = {
{ "mget", mgethelp, 1, 1, 1, mget }, { "mget", mgethelp, 1, 1, 1, mget },
{ "mkdir", mkdirhelp, 0, 1, 1, makedir }, { "mkdir", mkdirhelp, 0, 1, 1, makedir },
{ "mls", mlshelp, 1, 1, 1, mls }, { "mls", mlshelp, 1, 1, 1, mls },
{ "mode", modehelp, 0, 1, 1, setmode }, { "mode", modehelp, 0, 1, 1, fsetmode },
{ "modtime", modtimehelp, 0, 1, 1, modtime }, { "modtime", modtimehelp, 0, 1, 1, modtime },
{ "mput", mputhelp, 1, 1, 1, mput }, { "mput", mputhelp, 1, 1, 1, mput },
{ "newer", newerhelp, 1, 1, 1, newer }, { "newer", newerhelp, 1, 1, 1, newer },

View file

@ -36,7 +36,6 @@ void domacro(argc, argv)
register char *cp1, *cp2; register char *cp1, *cp2;
int count = 2, loopflg = 0; int count = 2, loopflg = 0;
char line2[200]; char line2[200];
extern char **glob();
struct cmd *getcmd(), *c; struct cmd *getcmd(), *c;
if (argc < 2) { if (argc < 2) {

View file

@ -35,12 +35,11 @@ void blkfree(char **av0)
free(*av++); free(*av++);
} }
char *glob(register char *v) char **glob(register char *v)
{ {
return NULL; return NULL;
} }
int sleep(int time) int sleep(int time)
{ {
return time; return time;
@ -50,8 +49,8 @@ int herror(char *string)
{ {
return 0; return 0;
} }
#if 0
#if 0
int gettimeofday(struct timeval *timenow, int gettimeofday(struct timeval *timenow,
struct timezone *zone) struct timezone *zone)
{ {
@ -294,11 +293,13 @@ char *getpass (const char * prompt)
return NULL; return NULL;
} }
#if 0
// Stubbed out here. Should be changed in Source code... // Stubbed out here. Should be changed in Source code...
int access(const char *filename, int accessmethod) int access(const char *filename, int accessmethod)
{ {
return 0; return 0;
} }
#endif
#ifndef __GNUC__ #ifndef __GNUC__
#define EPOCHFILETIME (116444736000000000i64) #define EPOCHFILETIME (116444736000000000i64)

View file

@ -260,7 +260,7 @@ int login(char *host)
return (1); return (1);
} }
void static void
cmdabort(int sig) cmdabort(int sig)
{ {
extern jmp_buf ptabort; extern jmp_buf ptabort;
@ -422,7 +422,7 @@ getreply(expecteof)
} }
} }
int static int
empty(mask, sec) empty(mask, sec)
struct fd_set *mask; struct fd_set *mask;
int sec; int sec;
@ -436,6 +436,7 @@ empty(mask, sec)
jmp_buf sendabort; jmp_buf sendabort;
#if 0
void abortsend() void abortsend()
{ {
@ -445,6 +446,7 @@ void abortsend()
(void) fflush(stdout); (void) fflush(stdout);
longjmp(sendabort, 1); longjmp(sendabort, 1);
} }
#endif
#define HASHBYTES 1024 #define HASHBYTES 1024
@ -454,7 +456,6 @@ void sendrequest(char *cmd, char *local, char *remote, int printnames)
int dout = 0; int dout = 0;
int (*closefunc)(), _pclose(), fclose(); int (*closefunc)(), _pclose(), fclose();
sig_t (*oldintr)(), (*oldintp)(); sig_t (*oldintr)(), (*oldintp)();
void abortsend();
char buf[BUFSIZ], *bufp; char buf[BUFSIZ], *bufp;
long bytes = 0, hashbytes = HASHBYTES; long bytes = 0, hashbytes = HASHBYTES;
register int c, d; register int c, d;
@ -710,7 +711,7 @@ null();// (void) signal(SIGPIPE, oldintp);
jmp_buf recvabort; jmp_buf recvabort;
#if 0
void abortrecv() void abortrecv()
{ {
@ -720,6 +721,7 @@ void abortrecv()
(void) fflush(stdout); (void) fflush(stdout);
longjmp(recvabort, 1); longjmp(recvabort, 1);
} }
#endif
void recvrequest(char *cmd, char *local, char *remote, char *mode, void recvrequest(char *cmd, char *local, char *remote, char *mode,
int printnames) int printnames)
@ -728,9 +730,8 @@ void recvrequest(char *cmd, char *local, char *remote, char *mode,
int din = 0; int din = 0;
int (*closefunc)(), _pclose(), fclose(); int (*closefunc)(), _pclose(), fclose();
void (*oldintr)(int), (*oldintp)(int); void (*oldintr)(int), (*oldintp)(int);
void abortrecv();
int oldverbose = 0, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0; int oldverbose = 0, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0;
char *gunique(), msg; char msg;
// static char *buf; // Szurgot: Shouldn't this go SOMEWHERE? // static char *buf; // Szurgot: Shouldn't this go SOMEWHERE?
char buf[1024]; char buf[1024];
static int bufsize = 1024; static int bufsize = 1024;
@ -1417,6 +1418,7 @@ void pswitch(int flag)
jmp_buf ptabort; jmp_buf ptabort;
int ptabflg; int ptabflg;
#if 0
void void
abortpt() abortpt()
{ {
@ -1427,12 +1429,12 @@ abortpt()
abrtflag = 0; abrtflag = 0;
longjmp(ptabort, 1); longjmp(ptabort, 1);
} }
#endif
void proxtrans(cmd, local, remote) void proxtrans(cmd, local, remote)
char *cmd, *local, *remote; char *cmd, *local, *remote;
{ {
// void (*oldintr)(int); // void (*oldintr)(int);
//void abortpt(int);
int tmptype, oldtype = 0, secndflag = 0, nfnd; int tmptype, oldtype = 0, secndflag = 0, nfnd;
extern jmp_buf ptabort; extern jmp_buf ptabort;
char *cmd2; char *cmd2;
@ -1756,6 +1758,7 @@ void reset()
} }
} }
#if 0
char * char *
gunique(local) gunique(local)
char *local; char *local;
@ -1802,6 +1805,7 @@ gunique(local)
} }
return(new); return(new);
} }
#endif
int null(void) int null(void)
{ {

View file

@ -1,18 +1,10 @@
#include <winsock.h> #include <winsock.h>
#include "fake.h" #include "fake.h"
#include "prototypes.h"
#include <setjmp.h> #include <setjmp.h>
//typedef void (*Sig_t)(int); //typedef void (*Sig_t)(int);
int fgetcSocket(int s);
char *fputsSocket(char *format, int s);
char *fprintfSocket(int s, char *format, ...);
int fputcSocket(int s, char putChar);
int fputSocket(int s, char *putChar, int len);
char *fgetsSocket(int s, char *string);
/* The following defines are from ftp.h and telnet.h from bsd.h */ /* The following defines are from ftp.h and telnet.h from bsd.h */
/* All relevent copyrights below apply. */ /* All relevent copyrights below apply. */
@ -153,7 +145,7 @@ struct cmd {
char c_bell; /* give bell when command completes */ char c_bell; /* give bell when command completes */
char c_conn; /* must be connected to use command */ char c_conn; /* must be connected to use command */
char c_proxy; /* proxy server may execute */ char c_proxy; /* proxy server may execute */
int (*c_handler)(); /* function to call */ void (*c_handler)(); /* function to call */
}; };
struct macel { struct macel {
@ -166,11 +158,6 @@ int macnum; /* number of defined macros */
struct macel macros[16]; struct macel macros[16];
char macbuf[4096]; char macbuf[4096];
extern char *tail();
extern char *remglob();
extern int errno;
extern char *mktemp();
#if defined(__ANSI__) || defined(sparc) #if defined(__ANSI__) || defined(sparc)
typedef void sig_t; typedef void sig_t;
#else #else
@ -178,4 +165,4 @@ typedef int sig_t;
#endif #endif
typedef int uid_t; typedef int uid_t;
int herror(char *s);

View file

@ -121,6 +121,7 @@ int mflag; /* flag: if != 0, then active multi command */
int options; /* used during socket creation */ int options; /* used during socket creation */
static char *slurpstring();
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -310,8 +311,6 @@ void cmdscanner(top)
int top; int top;
{ {
register struct cmd *c; register struct cmd *c;
struct cmd *getcmd();
extern int help();
if (!top) if (!top)
(void) putchar('\n'); (void) putchar('\n');
@ -395,7 +394,6 @@ int slrflag;
void makeargv() void makeargv()
{ {
char **argp; char **argp;
char *slurpstring();
margc = 0; margc = 0;
argp = margv; argp = margv;
@ -411,7 +409,7 @@ void makeargv()
* implemented with FSM to * implemented with FSM to
* handle quoting and strings * handle quoting and strings
*/ */
char * static char *
slurpstring() slurpstring()
{ {
int got_one = 0; int got_one = 0;
@ -535,7 +533,7 @@ OUT1:
* Help command. * Help command.
* Call each command handler with argc == 0 and argv[0] == name. * Call each command handler with argc == 0 and argv[0] == name.
*/ */
int help(argc, argv) void help(argc, argv)
int argc; int argc;
char *argv[]; char *argv[];
{ {
@ -582,7 +580,7 @@ int help(argc, argv)
} }
} }
(void) fflush(stdout); (void) fflush(stdout);
return 0; return;
} }
while (--argc > 0) { while (--argc > 0) {
register char *arg; register char *arg;
@ -597,5 +595,4 @@ int help(argc, argv)
c->c_name, c->c_help); c->c_name, c->c_help);
} }
(void) fflush(stdout); (void) fflush(stdout);
return 0;
} }

View file

@ -1,4 +1,17 @@
int fgetcSocket(int s);
char *fputsSocket(char *format, int s);
char *fprintfSocket(int s, char *format, ...);
int fputcSocket(int s, char putChar);
int fputSocket(int s, char *putChar, int len);
char *fgetsSocket(int s, char *string);
char *hookup();
char **glob();
int herror(char *s);
int getreply(int expecteof); int getreply(int expecteof);
int ruserpass(char *host, char **aname, char **apass, char **aacct); int ruserpass(char *host, char **aname, char **apass, char **aacct);
char *getpass(const char *prompt); char *getpass(const char *prompt);
@ -29,3 +42,25 @@ int confirm(char *cmd, char *file);
void blkfree(char **av0); void blkfree(char **av0);
int getit(int argc, char *argv[], int restartit, char *mode); int getit(int argc, char *argv[], int restartit, char *mode);
int sleep(int time); int sleep(int time);
char *tail();
int errno;
char *mktemp();
void setbell(), setdebug();
void setglob(), sethash(), setport();
void setprompt();
void settrace(), setverbose();
void settype(), setform(), setstruct();
void restart(), syst();
void cd(), lcd(), delete(), mdelete();
void ls(), mls(), get(), mget(), help(), append(), put(), mput(), reget();
void status();
void renamefile();
void quote(), rmthelp(), site();
void pwd(), makedir(), removedir(), setcr();
void account(), doproxy(), reset(), setcase(), setntrans(), setnmap();
void setsunique(), setrunique(), cdup(), macdef();
void sizecmd(), modtime(), newer(), rmtstatus();
void do_chmod(), do_umask(), idle();
void shell(), user(), fsetmode();
struct cmd *getcmd();

View file

@ -73,7 +73,7 @@ static TCHAR* GetInterfaceTypeName(UINT nInterfaceType)
} }
} }
void PrintPhysicalAddr(PBYTE Addr, UINT len) static void PrintPhysicalAddr(PBYTE Addr, UINT len)
{ {
UINT i=0; UINT i=0;
for (i=0; i<len; i++) for (i=0; i<len; i++)

View file

@ -50,7 +50,7 @@ static char TcpState[][32] = {
"DELETE_TCB" "DELETE_TCB"
}; };
VOID PrintError(DWORD ErrorCode) static VOID PrintError(DWORD ErrorCode)
{ {
LPVOID lpMsgBuf; LPVOID lpMsgBuf;
@ -182,37 +182,6 @@ static void ShowAdapterInfo()
} }
#endif #endif
/*
typedef struct {
UINT idLength;
UINT* ids;
} AsnObjectIdentifier;
VOID SnmpUtilPrintAsnAny(AsnAny* pAny); // pointer to value to print
VOID SnmpUtilPrintOid(AsnObjectIdentifier* Oid); // object identifier to print
*/
void test_snmp(void)
{
int nBytes = 500;
BYTE* pCache;
pCache = (BYTE*)SnmpUtilMemAlloc(nBytes);
if (pCache != NULL) {
AsnObjectIdentifier* pOidSrc = NULL;
AsnObjectIdentifier AsnObId;
if (SnmpUtilOidCpy(&AsnObId, pOidSrc)) {
//
//
//
SnmpUtilOidFree(&AsnObId);
}
SnmpUtilMemFree(pCache);
} else {
_tprintf(_T("ERROR: call to SnmpUtilMemAlloc() failed\n"));
}
}
// Maximum string lengths for ASCII ip address and port names // Maximum string lengths for ASCII ip address and port names
// //
#define HOSTNAMELEN 256 #define HOSTNAMELEN 256
@ -264,7 +233,7 @@ typedef struct {
// //
// Translate port numbers into their text equivalent if there is one // Translate port numbers into their text equivalent if there is one
// //
PCHAR static PCHAR
GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen) GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen)
{ {
struct servent *psrvent; struct servent *psrvent;
@ -288,7 +257,7 @@ GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen)
// //
// Translate IP addresses into their name-resolved form if possible. // Translate IP addresses into their name-resolved form if possible.
// //
PCHAR static PCHAR
GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen) GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen)
{ {
// struct hostent *phostent; // struct hostent *phostent;
@ -352,7 +321,7 @@ GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen)
return name; return name;
} }
BOOLEAN usage(void) static BOOLEAN usage(void)
{ {
TCHAR buffer[MAX_RESLEN]; TCHAR buffer[MAX_RESLEN];
@ -366,7 +335,7 @@ BOOLEAN usage(void)
// //
// Parses the command line arguments. // Parses the command line arguments.
// //
BOOLEAN static BOOLEAN
GetOptions(int argc, char *argv[], PDWORD pFlags) GetOptions(int argc, char *argv[], PDWORD pFlags)
{ {
int i, j; int i, j;
@ -498,6 +467,37 @@ int main(int argc, char *argv[])
#else #else
/*
typedef struct {
UINT idLength;
UINT* ids;
} AsnObjectIdentifier;
VOID SnmpUtilPrintAsnAny(AsnAny* pAny); // pointer to value to print
VOID SnmpUtilPrintOid(AsnObjectIdentifier* Oid); // object identifier to print
*/
static void test_snmp(void)
{
int nBytes = 500;
BYTE* pCache;
pCache = (BYTE*)SnmpUtilMemAlloc(nBytes);
if (pCache != NULL) {
AsnObjectIdentifier* pOidSrc = NULL;
AsnObjectIdentifier AsnObId;
if (SnmpUtilOidCpy(&AsnObId, pOidSrc)) {
//
//
//
SnmpUtilOidFree(&AsnObId);
}
SnmpUtilMemFree(pCache);
} else {
_tprintf(_T("ERROR: call to SnmpUtilMemAlloc() failed\n"));
}
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
if (argc > 1) { if (argc > 1) {

View file

@ -106,7 +106,7 @@ BOOL UsePerformanceCounter;
/* Display the contents of a buffer */ /* Display the contents of a buffer */
VOID DisplayBuffer( static VOID DisplayBuffer(
PVOID Buffer, PVOID Buffer,
DWORD Size) DWORD Size)
{ {
@ -125,7 +125,7 @@ VOID DisplayBuffer(
} }
/* Display usage information on screen */ /* Display usage information on screen */
VOID Usage(VOID) static VOID Usage(VOID)
{ {
printf("\nUsage: ping [-t] [-n count] [-l size] [-w timeout] destination-host\n\n"); printf("\nUsage: ping [-t] [-n count] [-l size] [-w timeout] destination-host\n\n");
printf("Options:\n"); printf("Options:\n");
@ -137,7 +137,7 @@ VOID Usage(VOID)
} }
/* Reset configuration to default values */ /* Reset configuration to default values */
VOID Reset(VOID) static VOID Reset(VOID)
{ {
LARGE_INTEGER PerformanceCounterFrequency; LARGE_INTEGER PerformanceCounterFrequency;
@ -173,7 +173,7 @@ VOID Reset(VOID)
} }
/* Return ULONG in a string */ /* Return ULONG in a string */
ULONG GetULONG(LPSTR String) static ULONG GetULONG(LPSTR String)
{ {
UINT i, Length; UINT i, Length;
ULONG Value; ULONG Value;
@ -191,7 +191,7 @@ ULONG GetULONG(LPSTR String)
} }
/* Return ULONG in a string. Try next paramter if not successful */ /* Return ULONG in a string. Try next paramter if not successful */
ULONG GetULONG2(LPSTR String1, LPSTR String2, PINT i) static ULONG GetULONG2(LPSTR String1, LPSTR String2, PINT i)
{ {
ULONG Value; ULONG Value;
@ -209,7 +209,7 @@ ULONG GetULONG2(LPSTR String1, LPSTR String2, PINT i)
} }
/* Parse command line parameters */ /* Parse command line parameters */
BOOL ParseCmdline(int argc, char* argv[]) static BOOL ParseCmdline(int argc, char* argv[])
{ {
INT i; INT i;
BOOL ShowUsage; BOOL ShowUsage;
@ -278,7 +278,7 @@ BOOL ParseCmdline(int argc, char* argv[])
} }
/* Calculate checksum of data */ /* Calculate checksum of data */
WORD Checksum(PUSHORT data, UINT size) static WORD Checksum(PUSHORT data, UINT size)
{ {
ULONG sum = 0; ULONG sum = 0;
@ -297,7 +297,7 @@ WORD Checksum(PUSHORT data, UINT size)
} }
/* Prepare to ping target */ /* Prepare to ping target */
BOOL Setup(VOID) static BOOL Setup(VOID)
{ {
WORD wVersionRequested; WORD wVersionRequested;
WSADATA WsaData; WSADATA WsaData;
@ -354,7 +354,7 @@ BOOL Setup(VOID)
} }
/* Close socket */ /* Close socket */
VOID Cleanup(VOID) static VOID Cleanup(VOID)
{ {
if (IcmpSock != INVALID_SOCKET) if (IcmpSock != INVALID_SOCKET)
closesocket(IcmpSock); closesocket(IcmpSock);
@ -362,7 +362,7 @@ VOID Cleanup(VOID)
WSACleanup(); WSACleanup();
} }
VOID QueryTime(PLARGE_INTEGER Time) static VOID QueryTime(PLARGE_INTEGER Time)
{ {
if (UsePerformanceCounter) { if (UsePerformanceCounter) {
if (QueryPerformanceCounter(Time) == 0) { if (QueryPerformanceCounter(Time) == 0) {
@ -384,7 +384,7 @@ VOID QueryTime(PLARGE_INTEGER Time)
} }
} }
VOID TimeToMsString(LPSTR String, LARGE_INTEGER Time) static VOID TimeToMsString(LPSTR String, LARGE_INTEGER Time)
{ {
CHAR Convstr[40]; CHAR Convstr[40];
LARGE_INTEGER LargeTime; LARGE_INTEGER LargeTime;
@ -398,7 +398,7 @@ VOID TimeToMsString(LPSTR String, LARGE_INTEGER Time)
/* Locate the ICMP data and print it. Returns TRUE if the packet was good, /* Locate the ICMP data and print it. Returns TRUE if the packet was good,
FALSE if not */ FALSE if not */
BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from) static BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
{ {
PIPv4_HEADER IpHeader; PIPv4_HEADER IpHeader;
PICMP_ECHO_PACKET Icmp; PICMP_ECHO_PACKET Icmp;
@ -462,7 +462,7 @@ BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
} }
/* Send and receive one ping */ /* Send and receive one ping */
BOOL Ping(VOID) static BOOL Ping(VOID)
{ {
INT Status; INT Status;
SOCKADDR From; SOCKADDR From;

View file

@ -20,7 +20,7 @@
#define IPBUF 17 #define IPBUF 17
#define IN_ADDR_OF(x) *((struct in_addr *)&(x)) #define IN_ADDR_OF(x) *((struct in_addr *)&(x))
int Usage() static int Usage()
{ {
_ftprintf( stderr, _ftprintf( stderr,
_T("route usage:\n" _T("route usage:\n"
@ -33,7 +33,7 @@ int Usage()
return 1; return 1;
} }
int PrintRoutes() static int PrintRoutes()
{ {
PMIB_IPFORWARDTABLE IpForwardTable = NULL; PMIB_IPFORWARDTABLE IpForwardTable = NULL;
PIP_ADAPTER_INFO pAdapterInfo; PIP_ADAPTER_INFO pAdapterInfo;
@ -154,7 +154,7 @@ Error:
} }
} }
int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd, static int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd,
int argc, TCHAR **argv ) { int argc, TCHAR **argv ) {
int i; int i;
#if UNICODE #if UNICODE
@ -205,7 +205,7 @@ int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd,
return TRUE; return TRUE;
} }
int add_route( int argc, TCHAR **argv ) { static int add_route( int argc, TCHAR **argv ) {
MIB_IPFORWARDROW RowToAdd = { 0 }; MIB_IPFORWARDROW RowToAdd = { 0 };
DWORD Error; DWORD Error;
@ -229,7 +229,7 @@ int add_route( int argc, TCHAR **argv ) {
return Error; return Error;
} }
int del_route( int argc, TCHAR **argv ) static int del_route( int argc, TCHAR **argv )
{ {
MIB_IPFORWARDROW RowToDel = { 0 }; MIB_IPFORWARDROW RowToDel = { 0 };
DWORD Error; DWORD Error;
@ -252,9 +252,11 @@ int del_route( int argc, TCHAR **argv )
return Error; return Error;
} }
#if defined(_UNICODE) && defined(__GNUC__)
static
#endif
int _tmain( int argc, TCHAR **argv ) int _tmain( int argc, TCHAR **argv )
{ {
if( argc < 2 ) if( argc < 2 )
return Usage(); return Usage();
else if ( !_tcscmp( argv[1], _T("print") ) ) else if ( !_tcscmp( argv[1], _T("print") ) )

View file

@ -70,7 +70,19 @@ INT iMaxHops = 30; // -h Max number of hops before trace ends
INT iHostList; // -j @UNIMPLEMENTED@ INT iHostList; // -j @UNIMPLEMENTED@
INT iTimeOut = 2000; // -w time before packet times out INT iTimeOut = 2000; // -w time before packet times out
/* function definitions */
static BOOL ParseCmdline(int argc, char* argv[]);
static INT Driver(void);
static INT Setup(INT ttl);
static VOID SetupTimingMethod(void);
static VOID ResolveHostname(void);
static VOID PreparePacket(INT packetSize, INT seqNum);
static INT SendPacket(INT datasize);
static INT ReceivePacket(INT datasize);
static INT DecodeResponse(INT packetSize, INT seqNum);
static LONG GetTime(void);
static WORD CheckSum(PUSHORT data, UINT size);
static VOID Usage(void);
/* /*
@ -78,7 +90,7 @@ INT iTimeOut = 2000; // -w time before packet times out
* Parse command line parameters and set any options * Parse command line parameters and set any options
* *
*/ */
BOOL ParseCmdline(int argc, char* argv[]) static BOOL ParseCmdline(int argc, char* argv[])
{ {
int i; int i;
@ -122,7 +134,7 @@ BOOL ParseCmdline(int argc, char* argv[])
* Driver function, controls the traceroute program * Driver function, controls the traceroute program
* *
*/ */
INT Driver(VOID) static INT Driver(VOID)
{ {
INT iHopCount = 1; // hop counter. default max is 30 INT iHopCount = 1; // hop counter. default max is 30
@ -311,7 +323,7 @@ INT Driver(VOID)
* gettickcount, so set the figures to 1 * gettickcount, so set the figures to 1
* *
*/ */
VOID SetupTimingMethod(VOID) static VOID SetupTimingMethod(VOID)
{ {
LARGE_INTEGER PerformanceCounterFrequency; LARGE_INTEGER PerformanceCounterFrequency;
@ -343,7 +355,7 @@ VOID SetupTimingMethod(VOID)
* SOCKADDR_IN members needed for the connection. * SOCKADDR_IN members needed for the connection.
* *
*/ */
VOID ResolveHostname(VOID) static VOID ResolveHostname(VOID)
{ {
HOSTENT *hp; HOSTENT *hp;
ULONG addr; ULONG addr;
@ -386,7 +398,7 @@ VOID ResolveHostname(VOID)
* set in the outgoing IP packet. * set in the outgoing IP packet.
* *
*/ */
INT Setup(INT iTTL) static INT Setup(INT iTTL)
{ {
INT iSockRet; INT iSockRet;
@ -422,7 +434,7 @@ INT Setup(INT iTTL)
* Calculate the packet checksum * Calculate the packet checksum
* *
*/ */
VOID PreparePacket(INT iPacketSize, INT iSeqNum) static VOID PreparePacket(INT iPacketSize, INT iSeqNum)
{ {
/* assemble ICMP echo request packet */ /* assemble ICMP echo request packet */
sendpacket.icmpheader.type = ECHO_REQUEST; sendpacket.icmpheader.type = ECHO_REQUEST;
@ -443,7 +455,7 @@ VOID PreparePacket(INT iPacketSize, INT iSeqNum)
* address. * address.
* *
*/ */
INT SendPacket(INT datasize) static INT SendPacket(INT datasize)
{ {
INT iSockRet; INT iSockRet;
INT iPacketSize; INT iPacketSize;
@ -498,7 +510,7 @@ INT SendPacket(INT datasize)
* If we don't recieve a packet, do some checking to establish why. * If we don't recieve a packet, do some checking to establish why.
* *
*/ */
INT ReceivePacket(INT datasize) static INT ReceivePacket(INT datasize)
{ {
TIMEVAL timeVal; TIMEVAL timeVal;
FD_SET readFDS; FD_SET readFDS;
@ -573,7 +585,7 @@ INT ReceivePacket(INT datasize)
* It all is well, print the time taken for the round trip. * It all is well, print the time taken for the round trip.
* *
*/ */
INT DecodeResponse(INT iPacketSize, INT iSeqNum) static INT DecodeResponse(INT iPacketSize, INT iSeqNum)
{ {
unsigned short header_len = recvpacket.h_len * 4; unsigned short header_len = recvpacket.h_len * 4;
/* cast the recieved packet into an ECHO reply and a TTL Exceed so we can check the ID*/ /* cast the recieved packet into an ECHO reply and a TTL Exceed so we can check the ID*/
@ -634,7 +646,7 @@ INT DecodeResponse(INT iPacketSize, INT iSeqNum)
* *
*/ */
LONG GetTime(VOID) static LONG GetTime(VOID)
{ {
LARGE_INTEGER Time; LARGE_INTEGER Time;
@ -662,7 +674,7 @@ LONG GetTime(VOID)
* Calculate packet checksum. * Calculate packet checksum.
* *
*/ */
WORD CheckSum(PUSHORT data, UINT size) static WORD CheckSum(PUSHORT data, UINT size)
{ {
DWORD dwSum = 0; DWORD dwSum = 0;
@ -687,7 +699,7 @@ WORD CheckSum(PUSHORT data, UINT size)
* print program usage to screen * print program usage to screen
* *
*/ */
VOID Usage(VOID) static VOID Usage(VOID)
{ {
_tprintf(_T("\nUsage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name\n\n" _tprintf(_T("\nUsage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name\n\n"
"Options:\n" "Options:\n"

View file

@ -68,17 +68,3 @@ typedef struct TTLExceedHeader
/* return to normal */ /* return to normal */
#include <poppack.h> #include <poppack.h>
/* function definitions */
//BOOL ParseCmdline(int argc, char* argv[]);
INT Driver(void);
INT Setup(INT ttl);
VOID SetupTimingMethod(void);
VOID ResolveHostname(void);
VOID PreparePacket(INT packetSize, INT seqNum);
INT SendPacket(INT datasize);
INT ReceivePacket(INT datasize);
INT DecodeResponse(INT packetSize, INT seqNum);
LONG GetTime(void);
WORD CheckSum(PUSHORT data, UINT size);
VOID Usage(void);

View file

@ -50,8 +50,8 @@
#define NICHOST "whois.internic.net" #define NICHOST "whois.internic.net"
void usage(); static void usage();
void leave(int iExitCode); static void leave(int iExitCode);
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -154,13 +154,13 @@ int main(int argc, char **argv)
return 0; return 0;
} }
void usage() static void usage()
{ {
(void)fprintf(stderr, "usage: whois [-h hostname] name ...\n"); (void)fprintf(stderr, "usage: whois [-h hostname] name ...\n");
leave(1); leave(1);
} }
void leave(int iExitCode) static void leave(int iExitCode)
{ {
WSACleanup(); WSACleanup();
exit(iExitCode); exit(iExitCode);

View file

@ -150,7 +150,8 @@ struct waitres {
{34,"MaximumWaitReason"}, {34,"MaximumWaitReason"},
{-1," ? "} {-1," ? "}
}; };
BOOL CALLBACK
static BOOL CALLBACK
EnumThreadProc(HWND hwnd, LPARAM lp) EnumThreadProc(HWND hwnd, LPARAM lp)
{ {
DWORD r, pid, tid; DWORD r, pid, tid;