Merge "Build System: Enable use of ~/.asterisk.makeopts and /etc/asterisk.makeopts."
authorMatt Jordan <mjordan@digium.com>
Thu, 16 Apr 2015 02:26:24 +0000 (21:26 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 16 Apr 2015 02:26:24 +0000 (21:26 -0500)
.gitignore
cel/cel_pgsql.c
tests/test_astobj2_weaken.c

index 0636510..c240644 100644 (file)
@@ -27,3 +27,5 @@ defaults.h
 makeopts
 makeopts.embed_rules
 menuselect-tree
+*.sha1
+*.pyc
index bb42151..2d7f0df 100644 (file)
@@ -101,7 +101,7 @@ static AST_RWLIST_HEAD_STATIC(psql_columns, columns);
                /* Lengthen buffer, if necessary */ \
                if (ast_str_strlen(sql) + size + 1 > ast_str_size(sql)) { \
                        if (ast_str_make_space(&sql, ((ast_str_size(sql) + size + 3) / 512 + 1) * 512) != 0) { \
-                               ast_log(LOG_ERROR, "Unable to allocate sufficient memory.  Insert CDR failed.\n"); \
+                               ast_log(LOG_ERROR, "Unable to allocate sufficient memory.  Insert CEL '%s:%s' failed.\n", pghostname, table); \
                                ast_free(sql); \
                                ast_free(sql2); \
                                AST_RWLIST_UNLOCK(&psql_columns); \
@@ -114,7 +114,7 @@ static AST_RWLIST_HEAD_STATIC(psql_columns, columns);
        do { \
                if (ast_str_strlen(sql2) + size + 1 > ast_str_size(sql2)) { \
                        if (ast_str_make_space(&sql2, ((ast_str_size(sql2) + size + 3) / 512 + 1) * 512) != 0) { \
-                               ast_log(LOG_ERROR, "Unable to allocate sufficient memory.  Insert CDR failed.\n"); \
+                               ast_log(LOG_ERROR, "Unable to allocate sufficient memory.  Insert CEL '%s:%s' failed.\n", pghostname, table); \
                                ast_free(sql); \
                                ast_free(sql2); \
                                AST_RWLIST_UNLOCK(&psql_columns); \
index b68aeda..e53ab7a 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 419175 $")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/utils.h"
 #include "asterisk/module.h"