From 5feb3d651dbd1b096a26963bd1dffcfe0a5f9eea Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 01:42:05 +0200 Subject: Remove useless initializations to 0 or NULL. They only inflate the .data section of the binary. Initializations to FALSE are still left to do. Signed-off-by: Ralf Baechle --- 6pack/m6pack.c | 2 +- ax25/ax25d.c | 2 +- ax25/axgetput/axgetput.c | 20 ++++++++++---------- ax25/axspawn.c | 18 +++++++++--------- ax25/mheard.c | 2 +- hdlcutil/fl/xfsmdiag_main.cxx | 2 +- hdlcutil/hdrvcomm.c | 2 +- hdlcutil/sethdlc.c | 2 +- hdlcutil/smdiag.c | 2 +- kiss/kissattach.c | 16 ++++++++-------- kiss/kissnetd.c | 6 +++--- kiss/mkiss.c | 16 ++++++++-------- kiss/net2kiss.c | 8 ++++---- netrom/netromd.c | 2 +- netrom/nrattach.c | 2 +- netrom/nrsdrv.c | 6 +++--- tcpip/rip98d.c | 4 ++-- tcpip/ttylinkd.c | 2 +- user_call/user_io.c | 4 ++-- 19 files changed, 59 insertions(+), 59 deletions(-) diff --git a/6pack/m6pack.c b/6pack/m6pack.c index 19c07ba..43d20cf 100644 --- a/6pack/m6pack.c +++ b/6pack/m6pack.c @@ -67,7 +67,7 @@ typedef enum {data, command} frame_t; static __u8 ibuf[SIZE]; /* buffer for input operations */ static __u8 obuf[SIZE]; /* buffer for sixpack_tx() */ -static int invalid_ports = 0; +static int invalid_ports; static char *usage_string = "usage: m6pack [-l] [-s speed] [-x num_ptmx_devices] [-v] tyinterface pty ..\n"; diff --git a/ax25/ax25d.c b/ax25/ax25d.c index 9e20b03..ee921ab 100644 --- a/ax25/ax25d.c +++ b/ax25/ax25d.c @@ -182,7 +182,7 @@ struct axlist { /* Have used same struct for quickness */ int LoggingVC; /* extra log stuff */ }; -static struct axlist *AXL = NULL; +static struct axlist *AXL; static char *ConfigFile = CONF_AX25D_FILE; static char User[10]; /* Room for 'GB9ZZZ-15\0' */ static char Node[10]; /* Room for 'GB9ZZZ-15\0' */ diff --git a/ax25/axgetput/axgetput.c b/ax25/axgetput/axgetput.c index 1696dbf..c2f4d25 100644 --- a/ax25/axgetput/axgetput.c +++ b/ax25/axgetput/axgetput.c @@ -24,25 +24,25 @@ #include "util.h" #include "proto_bin.h" -int fdin = 0; +int fdin; int fdout = 1; int fderr = 2; -int fdout_is_pipe = 0; -int fdin_is_pipe = 0; +int fdout_is_pipe; +int fdin_is_pipe; -int is_stream = 0; -int mode = 0; -int do_crc_only = 0; +int is_stream; +int mode; +int do_crc_only; char c_eol = '\n'; unsigned int BLOCKSIZ = BLOCKSIZ_DEFAULT; -char *send_on_signal = 0; +char *send_on_signal; static struct termios prev_termios; -static int prev_termios_stored = 0; -static mode_t mode_tty = 0; +static int prev_termios_stored; +static mode_t mode_tty; #ifndef MYNAME #define MYNAME "axgetput" @@ -98,7 +98,7 @@ static void eol_convention(int state_should) /* need patched axspawn */ #define BIN_ON "//BIN ON\r" #define BIN_OFF "//BIN OFF\r" - static int state_is = 0; + static int state_is; /* already in correct state? */ if ((state_is && state_should) || (!state_is && !state_should)) diff --git a/ax25/axspawn.c b/ax25/axspawn.c index 31fddbc..e92d3ac 100644 --- a/ax25/axspawn.c +++ b/ax25/axspawn.c @@ -428,12 +428,12 @@ static unsigned short mask16tab[16] = { char policy_add_user = 1; -char policy_add_empty_password = 0; -char policy_add_prog_useradd = 0; +char policy_add_empty_password; +char policy_add_prog_useradd; char policy_guest = 1; -char policy_associate = 0; +char policy_associate; char pwcheck = 1; -char secure_home = 0; +char secure_home; gid_t user_gid = 400; char *user_shell = "/bin/bash"; @@ -443,8 +443,8 @@ int start_uid = 400; int end_uid = 65535; int paclen = ROSE_PACLEN; /* Its the shortest ie safest */ -int huffman = 0; -int bin = 0; +int huffman; +int bin; int fdmaster; struct write_queue { @@ -453,8 +453,8 @@ struct write_queue { unsigned int len; }; -struct write_queue *wqueue_head = NULL; -struct write_queue *wqueue_tail = NULL; +struct write_queue *wqueue_head; +struct write_queue *wqueue_tail; long wqueue_length = 0L; @@ -850,7 +850,7 @@ int write_ax25(char *s, int len, int kick) struct termios termios; static struct termios save_termios; static struct termios save_termios_master; - static int last_ended_with_CR = 0; + static int last_ended_with_CR; int i = 0; int j = 0; diff --git a/ax25/mheard.c b/ax25/mheard.c index a7b46cf..c2f2013 100644 --- a/ax25/mheard.c +++ b/ax25/mheard.c @@ -35,7 +35,7 @@ static char *types[] = { "UI", "????"}; -static struct PortRecord *PortList = NULL; +static struct PortRecord *PortList; static void PrintHeader(int data) { diff --git a/hdlcutil/fl/xfsmdiag_main.cxx b/hdlcutil/fl/xfsmdiag_main.cxx index 1fd0dd8..2e05c29 100644 --- a/hdlcutil/fl/xfsmdiag_main.cxx +++ b/hdlcutil/fl/xfsmdiag_main.cxx @@ -53,7 +53,7 @@ /* ---------------------------------------------------------------------- */ static char *progname; -static unsigned int drawflags = 0; +static unsigned int drawflags; /* ---------------------------------------------------------------------- */ diff --git a/hdlcutil/hdrvcomm.c b/hdlcutil/hdrvcomm.c index 9f387ee..d27a37f 100644 --- a/hdlcutil/hdrvcomm.c +++ b/hdlcutil/hdrvcomm.c @@ -69,7 +69,7 @@ static const char *if_name = "bcsf0"; static char *prg_name; static int fd = -1; static struct ifreq ifr_h; -static int promisc = 0; +static int promisc; static int afpacket = 1; static int msqid = -1; diff --git a/hdlcutil/sethdlc.c b/hdlcutil/sethdlc.c index faa4765..3389a9e 100644 --- a/hdlcutil/sethdlc.c +++ b/hdlcutil/sethdlc.c @@ -47,7 +47,7 @@ /* ---------------------------------------------------------------------- */ -static unsigned char trace_stat = 0; +static unsigned char trace_stat; static char *progname; /* ---------------------------------------------------------------------- */ diff --git a/hdlcutil/smdiag.c b/hdlcutil/smdiag.c index 7dd9a00..6f9a79b 100644 --- a/hdlcutil/smdiag.c +++ b/hdlcutil/smdiag.c @@ -51,7 +51,7 @@ /* ---------------------------------------------------------------------- */ static char *progname; -static Display *display = NULL; +static Display *display; static Window window; static Pixmap pixmap; static unsigned long col_zeroline; diff --git a/kiss/kissattach.c b/kiss/kissattach.c index 49f5ee2..e61eabb 100644 --- a/kiss/kissattach.c +++ b/kiss/kissattach.c @@ -33,15 +33,15 @@ #endif static char *callsign; -static int speed = 0; -static int mtu = 0; +static int speed; +static int mtu; static int logging = FALSE; -static char *progname = NULL; -static char *kttyname = NULL; -static char *portname = NULL; -static char *inetaddr = NULL; -static int allow_broadcast = 0; -static int i_am_unix98_pty_master = 0; /* unix98 ptmx support */ +static char *progname; +static char *kttyname; +static char *portname; +static char *inetaddr; +static int allow_broadcast; +static int i_am_unix98_pty_master; /* unix98 ptmx support */ static char *kiss_basename(char *s) { diff --git a/kiss/kissnetd.c b/kiss/kissnetd.c index 304aed1..903ee22 100644 --- a/kiss/kissnetd.c +++ b/kiss/kissnetd.c @@ -25,7 +25,7 @@ #include static char *Version = "1.5"; -static int VerboseMode = 0; +static int VerboseMode; static int MaxFrameSize = 512; #define REOPEN_TIMEOUT 30 /* try tio reopen every 10 s */ @@ -43,7 +43,7 @@ struct PortDescriptor { static struct PortDescriptor *PortList[FD_SETSIZE]; -static int NbPort = 0; +static int NbPort; static void Usage(void) { @@ -161,7 +161,7 @@ static void ReopenPort(int PortNumber) static void TickReopen(void) { int i; - static int wrote_info = 0; + static int wrote_info; time_t CurrentTime = time(NULL); for (i=0; i /* Error in (de)compression happened? */ -static int compression_error = 0; +static int compression_error; /* These are for the (de)compressor */ static unsigned char input_buffer[BUFLEN]; -- cgit v1.2.3