diff options
| author | Ciaby <ciaby@rhizomatica.org> | 2015-08-06 18:50:35 +0200 |
|---|---|---|
| committer | Ciaby <ciaby@rhizomatica.org> | 2015-08-06 18:50:35 +0200 |
| commit | 43726c309318cd0165025c54b993fc12310ee2b2 (patch) | |
| tree | 71de5fd517ff0036ef29ce9dc0f67862df67af4c /openbsc/src/libmsc | |
| parent | a690bfe93bdbbfabae0825f2b543faa8db5c51a0 (diff) | |
| parent | daaea0c84fee46d9b63b746d5ed2cdf66f990352 (diff) | |
Merge branch 'master' into ciaby/2015-07-28
Diffstat (limited to 'openbsc/src/libmsc')
| -rw-r--r-- | openbsc/src/libmsc/db.c | 6 | ||||
| -rw-r--r-- | openbsc/src/libmsc/meas_feed.c | 2 | ||||
| -rw-r--r-- | openbsc/src/libmsc/vty_interface_layer3.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 428f99bbc..035202de8 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -301,7 +301,7 @@ static int update_db_revision_3(void) dbi_result_free(result); /* Cycle through old messages and convert them to the new format */ - result = dbi_conn_queryf(conn, "SELECT * FROM SMS_3"); + result = dbi_conn_query(conn, "SELECT * FROM SMS_3"); if (!result) { LOGP(DDB, LOGL_ERROR, "Failed fetch messages from the old SMS table (upgrade from rev 3).\n"); @@ -1095,8 +1095,8 @@ int db_subscriber_list_active(void (*cb)(struct gsm_subscriber*,void*), void *cl { dbi_result result; - result = dbi_conn_queryf(conn, - "SELECT * from Subscriber WHERE LAC != 0 AND authorized = 1"); + result = dbi_conn_query(conn, + "SELECT * from Subscriber WHERE LAC != 0 AND authorized = 1"); if (!result) { LOGP(DDB, LOGL_ERROR, "Failed to list active subscribers\n"); return -1; diff --git a/openbsc/src/libmsc/meas_feed.c b/openbsc/src/libmsc/meas_feed.c index 86d679abf..5fc7c4979 100644 --- a/openbsc/src/libmsc/meas_feed.c +++ b/openbsc/src/libmsc/meas_feed.c @@ -2,6 +2,8 @@ #include <unistd.h> +#include <sys/socket.h> + #include <osmocom/core/msgb.h> #include <osmocom/core/socket.h> #include <osmocom/core/write_queue.h> diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index 1515aea0a..71fff936f 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -547,7 +547,7 @@ DEFUN(ena_subscr_name, if (strlen(name) > sizeof(subscr->name)-1) { vty_out(vty, - "%% NAME is too long, max. %d characters are allowed%s", + "%% NAME is too long, max. %zu characters are allowed%s", sizeof(subscr->name)-1, VTY_NEWLINE); return CMD_WARNING; } @@ -580,7 +580,7 @@ DEFUN(ena_subscr_extension, if (strlen(ext) > sizeof(subscr->extension)-1) { vty_out(vty, - "%% EXTENSION is too long, max. %d characters are allowed%s", + "%% EXTENSION is too long, max. %zu characters are allowed%s", sizeof(subscr->extension)-1, VTY_NEWLINE); return CMD_WARNING; } |