[asterisk-commits] trunk r9259 - in /trunk: dsp.c enum.c file.c
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Feb 8 19:08:06 MST 2006
Author: russell
Date: Wed Feb 8 20:08:04 2006
New Revision: 9259
URL: http://svn.digium.com/view/asterisk?rev=9259&view=rev
Log:
various code cleanup changes including changing #define'd constants to enums,
comments to doxygen style, memory allocation to use ast_ wrappers, use calloc
instead of malloc+memset, and removing duplicated error messages (issue #6435)
Modified:
trunk/dsp.c
trunk/enum.c
trunk/file.c
Modified: trunk/dsp.c
URL: http://svn.digium.com/view/asterisk/trunk/dsp.c?rev=9259&r1=9258&r2=9259&view=diff
==============================================================================
--- trunk/dsp.c (original)
+++ trunk/dsp.c Wed Feb 8 20:08:04 2006
@@ -58,34 +58,41 @@
#include "asterisk/dsp.h"
#include "asterisk/ulaw.h"
#include "asterisk/alaw.h"
-
-/* Number of goertzels for progress detect */
-#define GSAMP_SIZE_NA 183 /* North America - 350, 440, 480, 620, 950, 1400, 1800 Hz */
-#define GSAMP_SIZE_CR 188 /* Costa Rica, Brazil - Only care about 425 Hz */
-#define GSAMP_SIZE_UK 160 /* UK disconnect goertzel feed - shoud trigger 400hz */
-
-#define PROG_MODE_NA 0
-#define PROG_MODE_CR 1
-#define PROG_MODE_UK 2
-
-/* For US modes */
-#define HZ_350 0
-#define HZ_440 1
-#define HZ_480 2
-#define HZ_620 3
-#define HZ_950 4
-#define HZ_1400 5
-#define HZ_1800 6
-
-/* For CR/BR modes */
-#define HZ_425 0
-
-/* For UK mode */
-#define HZ_400 0
+#include "asterisk/utils.h"
+
+/*! Number of goertzels for progress detect */
+enum gsamp_size {
+ GSAMP_SIZE_NA = 183, /*!< North America - 350, 440, 480, 620, 950, 1400, 1800 Hz */
+ GSAMP_SIZE_CR = 188, /*!< Costa Rica, Brazil - Only care about 425 Hz */
+ GSAMP_SIZE_UK = 160 /*!< UK disconnect goertzel feed - should trigger 400hz */
+};
+
+enum prog_mode {
+ PROG_MODE_NA = 0,
+ PROG_MODE_CR,
+ PROG_MODE_UK
+};
+
+enum freq_index {
+ /*! For US modes { */
+ HZ_350 = 0,
+ HZ_440,
+ HZ_480,
+ HZ_620,
+ HZ_950,
+ HZ_1400,
+ HZ_1800, /*!< } */
+
+ /*! For CR/BR modes */
+ HZ_425 = 0,
+
+ /*! For UK mode */
+ HZ_400 = 0
+};
static struct progalias {
char *name;
- int mode;
+ enum prog_mode mode;
} aliases[] = {
{ "us", PROG_MODE_NA },
{ "ca", PROG_MODE_NA },
@@ -95,39 +102,42 @@
};
static struct progress {
- int size;
+ enum gsamp_size size;
int freqs[7];
} modes[] = {
- { GSAMP_SIZE_NA, { 350, 440, 480, 620, 950, 1400, 1800 } }, /* North America */
- { GSAMP_SIZE_CR, { 425 } },
- { GSAMP_SIZE_UK, { 400 } },
+ { GSAMP_SIZE_NA, { 350, 440, 480, 620, 950, 1400, 1800 } }, /*!< North America */
+ { GSAMP_SIZE_CR, { 425 } }, /*!< Costa Rica, Brazil */
+ { GSAMP_SIZE_UK, { 400 } }, /*!< UK */
};
#define DEFAULT_THRESHOLD 512
-#define BUSY_PERCENT 10 /* The percentage difference between the two last silence periods */
-#define BUSY_PAT_PERCENT 7 /* The percentage difference between measured and actual pattern */
-#define BUSY_THRESHOLD 100 /* Max number of ms difference between max and min times in busy */
-#define BUSY_MIN 75 /* Busy must be at least 80 ms in half-cadence */
-#define BUSY_MAX 3100 /* Busy can't be longer than 3100 ms in half-cadence */
-
-/* Remember last 15 units */
+enum busy_detect {
+ BUSY_PERCENT = 10, /*!< The percentage difference between the two last silence periods */
+ BUSY_PAT_PERCENT = 7, /*!< The percentage difference between measured and actual pattern */
+ BUSY_THRESHOLD = 100, /*!< Max number of ms difference between max and min times in busy */
+ BUSY_MIN = 75, /*!< Busy must be at least 80 ms in half-cadence */
+ BUSY_MAX =3100 /*!< Busy can't be longer than 3100 ms in half-cadence */
+};
+
+/*! Remember last 15 units */
#define DSP_HISTORY 15
-/* Define if you want the fax detector -- NOT RECOMMENDED IN -STABLE */
+/*! Define if you want the fax detector -- NOT RECOMMENDED IN -STABLE */
#define FAX_DETECT
-#define TONE_THRESH 10.0 /* How much louder the tone should be than channel energy */
-#define TONE_MIN_THRESH 1e8 /* How much tone there should be at least to attempt */
-
- /* All THRESH_XXX values are in GSAMP_SIZE chunks (us = 22ms) */
-#define THRESH_RING 8 /* Need at least 150ms ring to accept */
-#define THRESH_TALK 2 /* Talk detection does not work continously */
-#define THRESH_BUSY 4 /* Need at least 80ms to accept */
-#define THRESH_CONGESTION 4 /* Need at least 80ms to accept */
-#define THRESH_HANGUP 60 /* Need at least 1300ms to accept hangup */
-#define THRESH_RING2ANSWER 300 /* Timeout from start of ring to answer (about 6600 ms) */
-
+#define TONE_THRESH 10.0 /*!< How much louder the tone should be than channel energy */
+#define TONE_MIN_THRESH 1e8 /*!< How much tone there should be at least to attempt */
+
+/*! All THRESH_XXX values are in GSAMP_SIZE chunks (us = 22ms) */
+enum gsamp_thresh {
+ THRESH_RING = 8, /*!< Need at least 150ms ring to accept */
+ THRESH_TALK = 2, /*!< Talk detection does not work continuously */
+ THRESH_BUSY = 4, /*!< Need at least 80ms to accept */
+ THRESH_CONGESTION = 4, /*!< Need at least 80ms to accept */
+ THRESH_HANGUP = 60, /*!< Need at least 1300ms to accept hangup */
+ THRESH_RING2ANSWER = 300 /*!< Timeout from start of ring to answer (about 6600 ms) */
+};
#define MAX_DTMF_DIGITS 128
@@ -331,8 +341,8 @@
goertzel_state_t freqs[7];
int freqcount;
int gsamps;
- int gsamp_size;
- int progmode;
+ enum gsamp_size gsamp_size;
+ enum prog_mode progmode;
int tstate;
int tcount;
int digitmode;
@@ -1434,8 +1444,7 @@
len = af->datalen / 2;
break;
case AST_FORMAT_ULAW:
- shortdata = alloca(af->datalen * 2);
- if (!shortdata) {
+ if (!(shortdata = alloca(af->datalen * 2))) {
ast_log(LOG_WARNING, "Unable to allocate stack space for data: %s\n", strerror(errno));
return af;
}
@@ -1443,8 +1452,7 @@
shortdata[x] = AST_MULAW(odata[x]);
break;
case AST_FORMAT_ALAW:
- shortdata = alloca(af->datalen * 2);
- if (!shortdata) {
+ if (!(shortdata = alloca(af->datalen * 2))) {
ast_log(LOG_WARNING, "Unable to allocate stack space for data: %s\n", strerror(errno));
return af;
}
@@ -1607,10 +1615,8 @@
struct ast_dsp *ast_dsp_new(void)
{
struct ast_dsp *dsp;
-
- dsp = malloc(sizeof(struct ast_dsp));
- if (dsp) {
- memset(dsp, 0, sizeof(struct ast_dsp));
+
+ if ((dsp = ast_calloc(1, sizeof(*dsp)))) {
dsp->threshold = DEFAULT_THRESHOLD;
dsp->features = DSP_FEATURE_SILENCE_SUPPRESS;
dsp->busycount = DSP_HISTORY;
Modified: trunk/enum.c
URL: http://svn.digium.com/view/asterisk/trunk/enum.c?rev=9259&r1=9258&r2=9259&view=diff
==============================================================================
--- trunk/enum.c (original)
+++ trunk/enum.c Wed Feb 8 20:08:04 2006
@@ -347,7 +347,7 @@
/*! \brief Callback from ENUM lookup function */
static int enum_callback(void *context, char *answer, int len, char *fullanswer)
{
- struct enum_context *c = (struct enum_context *)context;
+ struct enum_context *c = context;
void *p = NULL;
int res;
@@ -361,10 +361,9 @@
c->position++;
snprintf(c->dst, c->dstlen, "%d", c->position);
} else {
- p = realloc(c->naptr_rrs, sizeof(struct enum_naptr_rr)*(c->naptr_rrs_count+1));
- if (p) {
- c->naptr_rrs = (struct enum_naptr_rr*)p;
- memcpy(&c->naptr_rrs[c->naptr_rrs_count].naptr, answer, sizeof(struct naptr));
+ if ((p = ast_realloc(c->naptr_rrs, sizeof(*c->naptr_rrs) * (c->naptr_rrs_count + 1)))) {
+ c->naptr_rrs = p;
+ memcpy(&c->naptr_rrs[c->naptr_rrs_count].naptr, answer, sizeof(c->naptr_rrs->naptr));
/* printf("order=%d, pref=%d\n", ntohs(c->naptr_rrs[c->naptr_rrs_count].naptr.order), ntohs(c->naptr_rrs[c->naptr_rrs_count].naptr.pref)); */
c->naptr_rrs[c->naptr_rrs_count].result = strdup(c->dst);
c->naptr_rrs[c->naptr_rrs_count].tech = strdup(c->tech);
@@ -613,9 +612,7 @@
{
struct enum_search *tmp;
- tmp = malloc(sizeof(struct enum_search));
- if (tmp) {
- memset(tmp, 0, sizeof(struct enum_search));
+ if ((tmp = ast_calloc(1, sizeof(*tmp)))) {
ast_copy_string(tmp->toplev, s, sizeof(tmp->toplev));
}
return tmp;
Modified: trunk/file.c
URL: http://svn.digium.com/view/asterisk/trunk/file.c?rev=9259&r1=9258&r2=9259&view=diff
==============================================================================
--- trunk/file.c (original)
+++ trunk/file.c Wed Feb 8 20:08:04 2006
@@ -124,10 +124,8 @@
ast_log(LOG_WARNING, "Tried to register '%s' format, already registered\n", name);
return -1;
}
- }
- tmp = malloc(sizeof(struct ast_format));
- if (!tmp) {
- ast_log(LOG_WARNING, "Out of memory\n");
+ }
+ if (!(tmp = ast_malloc(sizeof(*tmp)))) {
AST_LIST_UNLOCK(&formats);
return -1;
}
@@ -301,16 +299,14 @@
if (filename[0] == '/') {
fnsize = strlen(filename) + strlen(type) + 2;
- fn = malloc(fnsize);
- if (fn)
+ if ((fn = ast_malloc(fnsize)))
snprintf(fn, fnsize, "%s.%s", filename, type);
} else {
char tmp[AST_CONFIG_MAX_PATH] = "";
snprintf(tmp, sizeof(tmp), "%s/%s", ast_config_AST_VAR_DIR, "sounds");
fnsize = strlen(tmp) + strlen(filename) + strlen(type) + 3;
- fn = malloc(fnsize);
- if (fn)
+ if ((fn = ast_malloc(fnsize)))
snprintf(fn, fnsize, "%s/%s.%s", tmp, filename, type);
}
@@ -333,13 +329,15 @@
return 0;
}
-#define ACTION_EXISTS 1
-#define ACTION_DELETE 2
-#define ACTION_RENAME 3
-#define ACTION_OPEN 4
-#define ACTION_COPY 5
-
-static int ast_filehelper(const char *filename, const char *filename2, const char *fmt, int action)
+enum file_action {
+ ACTION_EXISTS = 1,
+ ACTION_DELETE,
+ ACTION_RENAME,
+ ACTION_OPEN,
+ ACTION_COPY
+};
+
+static int ast_filehelper(const char *filename, const char *filename2, const char *fmt, const enum file_action action)
{
struct stat st;
struct ast_format *f;
@@ -389,8 +387,7 @@
if (res)
ast_log(LOG_WARNING, "rename(%s,%s) failed: %s\n", fn, nfn, strerror(errno));
free(nfn);
- } else
- ast_log(LOG_WARNING, "Out of memory\n");
+ }
break;
case ACTION_COPY:
nfn = build_filename(filename2, ext);
@@ -399,8 +396,7 @@
if (res)
ast_log(LOG_WARNING, "copy(%s,%s) failed: %s\n", fn, nfn, strerror(errno));
free(nfn);
- } else
- ast_log(LOG_WARNING, "Out of memory\n");
+ }
break;
case ACTION_OPEN:
if ((ret < 0) && ((chan->writeformat & f->format) ||
More information about the asterisk-commits
mailing list