aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/asterisk.c16
-rw-r--r--main/cdr.c2
-rw-r--r--main/channel.c6
-rw-r--r--main/dnsmgr.c2
-rw-r--r--main/enum.c2
-rw-r--r--main/file.c2
-rw-r--r--main/frame.c2
-rw-r--r--main/http.c6
-rw-r--r--main/logger.c6
-rw-r--r--main/manager.c10
-rw-r--r--main/pbx.c10
-rw-r--r--main/rtp.c14
-rw-r--r--main/term.c2
-rw-r--r--main/udptl.c18
14 files changed, 49 insertions, 49 deletions
diff --git a/main/asterisk.c b/main/asterisk.c
index 27f433896..929a83b47 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -154,11 +154,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 */
/*! @} */
@@ -185,8 +185,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];
@@ -227,8 +227,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 0d5357a30..02794ddf0 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];
diff --git a/main/channel.c b/main/channel.c
index 95293d661..18a5b7805 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, state2str_threadbuf_init);
#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 27d70a92d..aece8e572 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/file.c b/main/file.c
index 325676f6e..6c7863262 100644
--- a/main/file.c
+++ b/main/file.c
@@ -61,7 +61,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
* (i.e. en/digits/1.gsm, it/digits/1.gsm or default to digits/1.gsm).
* The latter permits a language to be entirely in one directory.
*/
-int ast_language_is_prefix = 0;
+int ast_language_is_prefix;
static AST_LIST_HEAD_STATIC(formats, ast_format);
diff --git a/main/frame.c b/main/frame.c
index a86e291ea..812c15a52 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 78b1a960b..330a9c0f4 100644
--- a/main/http.c
+++ b/main/http.c
@@ -65,14 +65,14 @@ struct ast_http_server_instance {
};
AST_MUTEX_DEFINE_STATIC(uris_lock);
-static struct ast_http_uri *uris = NULL;
+static struct ast_http_uri *uris;
static int httpfd = -1;
static pthread_t master = AST_PTHREADT_NULL;
static char prefix[MAX_PREFIX];
-static int prefix_len = 0;
+static int prefix_len;
static struct sockaddr_in oldsin;
-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 21effac71..1ec8bc66b 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -83,7 +83,7 @@ static int syslog_level_map[] = {
static char dateformat[256] = "%b %e %T"; /* Original Asterisk Format */
-static int filesize_reload_needed = 0;
+static int filesize_reload_needed;
static int global_logmask = -1;
static struct {
@@ -111,8 +111,8 @@ struct logchannel {
static AST_LIST_HEAD_STATIC(logchannels, logchannel);
-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 7a3270de9..c0fa09a47 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -92,16 +92,16 @@ struct eventqent {
char eventdata[1];
};
-static int enabled = 0;
+static int enabled;
static int portno = DEFAULT_MANAGER_PORT;
static int asock = -1;
static int displayconnects = 1;
-static int timestampevents = 0;
+static int timestampevents;
static int httptimeout = 60;
static pthread_t t;
-static int block_sockets = 0;
-static int num_sessions = 0;
+static int block_sockets;
+static int num_sessions;
/* Protected by the sessions list lock */
struct eventqent *master_eventq = NULL;
@@ -187,7 +187,7 @@ struct ast_manager_user {
static AST_LIST_HEAD_STATIC(users, ast_manager_user);
-static struct manager_action *first_action = NULL;
+static struct manager_action *first_action;
AST_MUTEX_DEFINE_STATIC(actionlock);
/*! \brief Convert authority code to string with serveral options */
diff --git a/main/pbx.c b/main/pbx.c
index 7002819be..06202ad0e 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -243,7 +243,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_LIST_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_LIST_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_LIST_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 9b97b7ee3..2c414f2f8 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 c275b98bc..6d5c82a2d 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);