[svn-commits] kpfleming: trunk r49008 - in /trunk: ./ main/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Dec 27 15:14:34 MST 2006
Author: kpfleming
Date: Wed Dec 27 16:14:33 2006
New Revision: 49008
URL: http://svn.digium.com/view/asterisk?view=rev&rev=49008
Log:
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)
........
Modified:
trunk/ (props changed)
trunk/main/asterisk.c
trunk/main/cdr.c
trunk/main/channel.c
trunk/main/dnsmgr.c
trunk/main/enum.c
trunk/main/frame.c
trunk/main/http.c
trunk/main/logger.c
trunk/main/manager.c
trunk/main/pbx.c
trunk/main/rtp.c
trunk/main/term.c
trunk/main/udptl.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Wed Dec 27 16:14:33 2006
@@ -155,11 +155,11 @@
struct ast_flags ast_options = { AST_DEFAULT_OPTIONS };
-int option_verbose = 0; /*!< Verbosity level */
-int option_debug = 0; /*!< Debug level */
-
-double option_maxload = 0.0; /*!< Max load avg on system */
-int option_maxcalls = 0; /*!< Max number of active calls */
+int option_verbose; /*!< Verbosity level */
+int option_debug; /*!< Debug level */
+
+double option_maxload; /*!< Max load avg on system */
+int option_maxcalls; /*!< Max number of active calls */
/*! @} */
@@ -186,8 +186,8 @@
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_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];
Modified: trunk/main/cdr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cdr.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Wed Dec 27 16:14:33 2006
@@ -57,7 +57,7 @@
/*! 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 @@
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;
Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed Dec 27 16:14:33 2006
@@ -95,11 +95,11 @@
#endif
/*! Prevent new channel allocation if shutting down. */
-static int shutting_down = 0;
-
-static int uniqueint = 0;
-
-unsigned long global_fin = 0, global_fout = 0;
+static int shutting_down;
+
+static int uniqueint;
+
+unsigned long global_fin, global_fout;
AST_THREADSTORAGE(state2str_threadbuf);
#define STATE2STR_BUFSIZE 32
Modified: trunk/main/dnsmgr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/dnsmgr.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/dnsmgr.c (original)
+++ trunk/main/dnsmgr.c Wed Dec 27 16:14:33 2006
@@ -71,7 +71,7 @@
#define REFRESH_DEFAULT 300
-static int enabled = 0;
+static int enabled;
static int refresh_interval;
struct refresh_info {
Modified: trunk/main/enum.c
URL: http://svn.digium.com/view/asterisk/trunk/main/enum.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/enum.c (original)
+++ trunk/main/enum.c Wed Dec 27 16:14:33 2006
@@ -85,7 +85,7 @@
struct enum_search *next;
} *toplevs;
-static int enumver = 0;
+static int enumver;
AST_MUTEX_DEFINE_STATIC(enumlock);
Modified: trunk/main/frame.c
URL: http://svn.digium.com/view/asterisk/trunk/main/frame.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/frame.c (original)
+++ trunk/main/frame.c Wed Dec 27 16:14:33 2006
@@ -45,7 +45,7 @@
#include "asterisk/linkedlists.h"
#ifdef TRACE_FRAMES
-static int headers = 0;
+static int headers;
static AST_LIST_HEAD_STATIC(headerlist, ast_frame);
#endif
Modified: trunk/main/http.c
URL: http://svn.digium.com/view/asterisk/trunk/main/http.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Wed Dec 27 16:14:33 2006
@@ -111,7 +111,7 @@
/* 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 {
Modified: trunk/main/logger.c
URL: http://svn.digium.com/view/asterisk/trunk/main/logger.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Wed Dec 27 16:14:33 2006
@@ -86,9 +86,9 @@
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 @@
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 FILE *eventlog = NULL;
-static FILE *qlog = NULL;
+static int close_logger_thread;
+
+static FILE *eventlog;
+static FILE *qlog;
static char *levels[] = {
"DEBUG",
Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Dec 27 16:14:33 2006
@@ -106,12 +106,12 @@
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 @@
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);
Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Dec 27 16:14:33 2006
@@ -246,7 +246,7 @@
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 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 @@
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;
Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Wed Dec 27 16:14:33 2006
@@ -77,17 +77,17 @@
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
/*!
Modified: trunk/main/term.c
URL: http://svn.digium.com/view/asterisk/trunk/main/term.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/term.c (original)
+++ trunk/main/term.c Wed Dec 27 16:14:33 2006
@@ -43,7 +43,7 @@
#include "asterisk/lock.h"
#include "asterisk/utils.h"
-static int vt100compat = 0;
+static int vt100compat;
static char prepdata[80] = "";
static char enddata[80] = "";
Modified: trunk/main/udptl.c
URL: http://svn.digium.com/view/asterisk/trunk/main/udptl.c?view=diff&rev=49008&r1=49007&r2=49008
==============================================================================
--- trunk/main/udptl.c (original)
+++ trunk/main/udptl.c Wed Dec 27 16:14:33 2006
@@ -55,17 +55,17 @@
#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 @@
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);
More information about the svn-commits
mailing list