kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_config_pgsql: Avoid typecasting an int to unsigned char.

Browse Source 
clang 5.0 warned about this.

ASTERISK-27576

Change-Id: If41f400a51973c06cdb9b75462e535b616bfe385
This commit is contained in:
Alexander Traud
2018-01-12 10:50:32 +01:00
parent e4ee41da4d
commit eb9b85baec
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/res_config_pgsql.c
View File

@@ -1215,7 +1215,8 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
struct columns *column;
struct tables *table;
char *elm;
int type, size, res = 0;
int type, res = 0;
unsigned int size;
/*
* Ignore database from the extconfig.conf since it was
@@ -1231,7 +1232,7 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
while ((elm = va_arg(ap, char *))) {
type = va_arg(ap, require_type);
size = va_arg(ap, int);
size = va_arg(ap, unsigned int);
AST_LIST_TRAVERSE(&table->columns, column, list) {
if (strcmp(column->name, elm) == 0) {
/* Char can hold anything, as long as it is large enough */
@@ -1288,14 +1289,14 @@ static int require_pgsql(const char *database, const char *tablename, va_list ap
res = -1;
} else {
struct ast_str *sql = ast_str_create(100);
char fieldtype[15];
char fieldtype[10];
PGresult *result;
if (requirements == RQ_CREATECHAR || type == RQ_CHAR) {
/* Size is minimum length; make it at least 50% greater,
* just to be sure, because PostgreSQL doesn't support
* resizing columns. */
snprintf(fieldtype, sizeof(fieldtype), "CHAR(%hhu)",
snprintf(fieldtype, sizeof(fieldtype), "CHAR(%u)",
size < 15 ? size * 2 :
(size * 3 / 2 > 255) ? 255 : size * 3 / 2);
} else if (type == RQ_INTEGER1 || type == RQ_UINTEGER1 || type == RQ_INTEGER2) {