From 87686ce87549113edc29ea5f32d96b7a90be509d Mon Sep 17 00:00:00 2001 From: kpfleming Date: Wed, 27 Dec 2006 22:14:33 +0000 Subject: Merged revisions 49006 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r49006 | kpfleming | 2006-12-27 16:06:56 -0600 (Wed, 27 Dec 2006) | 2 lines since these variables all have static duration, none of them need initializers (they default to zero anyway) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49008 f38db490-d61c-443f-a65b-d21fe96a405b --- main/asterisk.c | 16 ++++++++-------- main/cdr.c | 4 ++-- main/channel.c | 6 +++--- main/dnsmgr.c | 2 +- main/enum.c | 2 +- main/frame.c | 2 +- main/http.c | 2 +- main/logger.c | 10 +++++----- main/manager.c | 8 ++++---- main/pbx.c | 10 +++++----- main/rtp.c | 14 +++++++------- main/term.c | 2 +- main/udptl.c | 18 +++++++++--------- 13 files changed, 48 insertions(+), 48 deletions(-) (limited to 'main') diff --git a/main/asterisk.c b/main/asterisk.c index 8776051ba..db085a07e 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -155,11 +155,11 @@ int daemon(int, int); /* defined in libresolv of all places */ struct ast_flags ast_options = { AST_DEFAULT_OPTIONS }; -int option_verbose = 0; /*!< Verbosity level */ -int option_debug = 0; /*!< Debug level */ +int option_verbose; /*!< Verbosity level */ +int option_debug; /*!< Debug level */ -double option_maxload = 0.0; /*!< Max load avg on system */ -int option_maxcalls = 0; /*!< Max number of active calls */ +double option_maxload; /*!< Max load avg on system */ +int option_maxcalls; /*!< Max number of active calls */ /*! @} */ @@ -186,8 +186,8 @@ static AST_LIST_HEAD_STATIC(atexits, ast_atexit); time_t ast_startuptime; time_t ast_lastreloadtime; -static History *el_hist = NULL; -static EditLine *el = NULL; +static History *el_hist; +static EditLine *el; static char *remotehostname; struct console consoles[AST_MAX_CONNECTS]; @@ -228,8 +228,8 @@ extern const char *ast_build_date; extern const char *ast_build_user; static char *_argv[256]; -static int shuttingdown = 0; -static int restartnow = 0; +static int shuttingdown; +static int restartnow; static pthread_t consolethread = AST_PTHREADT_NULL; static char randompool[256]; diff --git a/main/cdr.c b/main/cdr.c index 3f6215c88..4920612f1 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -57,7 +57,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") /*! Default AMA flag for billing records (CDR's) */ int ast_default_amaflags = AST_CDR_DOCUMENTATION; -char ast_default_accountcode[AST_MAX_ACCOUNT_CODE] = ""; +char ast_default_accountcode[AST_MAX_ACCOUNT_CODE]; struct ast_cdr_beitem { char name[20]; @@ -77,7 +77,7 @@ static struct ast_cdr_batch { int size; struct ast_cdr_batch_item *head; struct ast_cdr_batch_item *tail; -} *batch = NULL; +} *batch; static struct sched_context *sched; static int cdr_sched = -1; diff --git a/main/channel.c b/main/channel.c index cb31be81a..79e400ece 100644 --- a/main/channel.c +++ b/main/channel.c @@ -95,11 +95,11 @@ struct ast_channel_whisper_buffer { #endif /*! Prevent new channel allocation if shutting down. */ -static int shutting_down = 0; +static int shutting_down; -static int uniqueint = 0; +static int uniqueint; -unsigned long global_fin = 0, global_fout = 0; +unsigned long global_fin, global_fout; AST_THREADSTORAGE(state2str_threadbuf); #define STATE2STR_BUFSIZE 32 diff --git a/main/dnsmgr.c b/main/dnsmgr.c index e7ce3190d..59c3a9994 100644 --- a/main/dnsmgr.c +++ b/main/dnsmgr.c @@ -71,7 +71,7 @@ AST_MUTEX_DEFINE_STATIC(refresh_lock); #define REFRESH_DEFAULT 300 -static int enabled = 0; +static int enabled; static int refresh_interval; struct refresh_info { diff --git a/main/enum.c b/main/enum.c index 498ca8152..8140edd06 100644 --- a/main/enum.c +++ b/main/enum.c @@ -85,7 +85,7 @@ static struct enum_search { struct enum_search *next; } *toplevs; -static int enumver = 0; +static int enumver; AST_MUTEX_DEFINE_STATIC(enumlock); diff --git a/main/frame.c b/main/frame.c index 16b4ae6e1..a6fd97ac9 100644 --- a/main/frame.c +++ b/main/frame.c @@ -45,7 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/linkedlists.h" #ifdef TRACE_FRAMES -static int headers = 0; +static int headers; static AST_LIST_HEAD_STATIC(headerlist, ast_frame); #endif diff --git a/main/http.c b/main/http.c index 14293c5d0..c350368d7 100644 --- a/main/http.c +++ b/main/http.c @@ -111,7 +111,7 @@ static AST_LIST_HEAD_STATIC(uris, ast_http_uri); /*!< list of supported handlers /* all valid URIs must be prepended by the string in prefix. */ static char prefix[MAX_PREFIX]; -static int enablestatic=0; +static int enablestatic; /*! \brief Limit the kinds of files we're willing to serve up */ static struct { diff --git a/main/logger.c b/main/logger.c index 541fa92db..3d9cb04a2 100644 --- a/main/logger.c +++ b/main/logger.c @@ -86,9 +86,9 @@ static char dateformat[256] = "%b %e %T"; /* Original Asterisk Format */ static char queue_log_name[256] = QUEUELOG; -static int filesize_reload_needed = 0; +static int filesize_reload_needed; static int global_logmask = -1; -static int rotatetimestamp = 0; +static int rotatetimestamp; static struct { unsigned int queue_log:1; @@ -134,10 +134,10 @@ struct logmsg { static AST_LIST_HEAD_STATIC(logmsgs, logmsg); static pthread_t logthread = AST_PTHREADT_NULL; static ast_cond_t logcond; -static int close_logger_thread = 0; +static int close_logger_thread; -static FILE *eventlog = NULL; -static FILE *qlog = NULL; +static FILE *eventlog; +static FILE *qlog; static char *levels[] = { "DEBUG", diff --git a/main/manager.c b/main/manager.c index bec62ab75..5e87114f1 100644 --- a/main/manager.c +++ b/main/manager.c @@ -106,12 +106,12 @@ struct eventqent { static AST_LIST_HEAD_STATIC(all_events, eventqent); static int displayconnects = 1; -static int timestampevents = 0; +static int timestampevents; static int httptimeout = 60; static pthread_t accept_thread_ptr; /*!< the accept thread */ -static int block_sockets = 0; -static int num_sessions = 0; +static int block_sockets; +static int num_sessions; static int manager_debug; /*!< enable some debugging code in the manager */ @@ -173,7 +173,7 @@ struct ast_manager_user { static AST_LIST_HEAD_STATIC(users, ast_manager_user); /*! \brief list of actions registered */ -static struct manager_action *first_action = NULL; +static struct manager_action *first_action; AST_MUTEX_DEFINE_STATIC(actionlock); static AST_RWLIST_HEAD_STATIC(manager_hooks, manager_custom_hook); diff --git a/main/pbx.c b/main/pbx.c index 736bd9432..946395304 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -246,7 +246,7 @@ static struct varshead globals = AST_LIST_HEAD_NOLOCK_INIT_VALUE; static int autofallthrough = 1; AST_MUTEX_DEFINE_STATIC(maxcalllock); -static int countcalls = 0; +static int countcalls; static AST_RWLIST_HEAD_STATIC(acf_root, ast_custom_function); @@ -460,7 +460,7 @@ static struct pbx_builtin { }; -static struct ast_context *contexts = NULL; +static struct ast_context *contexts; AST_MUTEX_DEFINE_STATIC(conlock); /*!< Lock for the ast_context list */ static AST_RWLIST_HEAD_STATIC(apps, ast_app); @@ -475,14 +475,14 @@ static int stateid = 1; paths that require both locks must also take them in that order. */ static AST_RWLIST_HEAD_STATIC(hints, ast_hint); -struct ast_state_cb *statecbs = NULL; +struct ast_state_cb *statecbs; /* \note This function is special. It saves the stack so that no matter how many times it is called, it returns to the same place */ int pbx_exec(struct ast_channel *c, /*!< Channel */ - struct ast_app *app, /*!< Application */ - void *data) /*!< Data for execution */ + struct ast_app *app, /*!< Application */ + void *data) /*!< Data for execution */ { int res; diff --git a/main/rtp.c b/main/rtp.c index b3fbf684a..9958591a2 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -77,17 +77,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static int dtmftimeout = DEFAULT_DTMF_TIMEOUT; -static int rtpstart = 0; /*!< First port for RTP sessions (set in rtp.conf) */ -static int rtpend = 0; /*!< Last port for RTP sessions (set in rtp.conf) */ -static int rtpdebug = 0; /*!< Are we debugging? */ -static int rtcpdebug = 0; /*!< Are we debugging RTCP? */ -static int rtcpstats = 0; /*!< Are we debugging RTCP? */ +static int rtpstart; /*!< First port for RTP sessions (set in rtp.conf) */ +static int rtpend; /*!< Last port for RTP sessions (set in rtp.conf) */ +static int rtpdebug; /*!< Are we debugging? */ +static int rtcpdebug; /*!< Are we debugging RTCP? */ +static int rtcpstats; /*!< Are we debugging RTCP? */ static int rtcpinterval = RTCP_DEFAULT_INTERVALMS; /*!< Time between rtcp reports in millisecs */ -static int stundebug = 0; /*!< Are we debugging stun? */ +static int stundebug; /*!< Are we debugging stun? */ static struct sockaddr_in rtpdebugaddr; /*!< Debug packets to/from this host */ static struct sockaddr_in rtcpdebugaddr; /*!< Debug RTCP packets to/from this host */ #ifdef SO_NO_CHECK -static int nochecksums = 0; +static int nochecksums; #endif /*! diff --git a/main/term.c b/main/term.c index 940396ee3..d051338d8 100644 --- a/main/term.c +++ b/main/term.c @@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/utils.h" -static int vt100compat = 0; +static int vt100compat; static char prepdata[80] = ""; static char enddata[80] = ""; diff --git a/main/udptl.c b/main/udptl.c index 42594af91..42bf7af5a 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -55,17 +55,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define TRUE (!FALSE) #endif -static int udptlstart = 0; -static int udptlend = 0; -static int udptldebug = 0; /* Are we debugging? */ +static int udptlstart; +static int udptlend; +static int udptldebug; /* Are we debugging? */ static struct sockaddr_in udptldebugaddr; /* Debug packets to/from this host */ #ifdef SO_NO_CHECK -static int nochecksums = 0; +static int nochecksums; #endif -static int udptlfectype = 0; -static int udptlfecentries = 0; -static int udptlfecspan = 0; -static int udptlmaxdatagram = 0; +static int udptlfectype; +static int udptlfecentries; +static int udptlfecspan; +static int udptlmaxdatagram; #define LOCAL_FAX_MAX_DATAGRAM 400 #define MAX_FEC_ENTRIES 5 @@ -137,7 +137,7 @@ struct ast_udptl { udptl_fec_rx_buffer_t rx[UDPTL_BUF_MASK + 1]; }; -static struct ast_udptl_protocol *protos = NULL; +static struct ast_udptl_protocol *protos; static int udptl_rx_packet(struct ast_udptl *s, uint8_t *buf, int len); static int udptl_build_packet(struct ast_udptl *s, uint8_t *buf, uint8_t *ifp, int ifp_len); -- cgit v1.2.3