diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-24 21:25:08 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-04-24 21:25:08 +0000 |
| commit | 023167651aa8b25d29b8d7f3d4a633fcaa9193f0 (patch) | |
| tree | f277260fe4931b71994ab251b75d1aeed2ba73b6 | |
| parent | 4c4c2c5f97a13e3b584a5176c457efb6d6a51e1a (diff) | |
| download | netsurf-023167651aa8b25d29b8d7f3d4a633fcaa9193f0.tar.gz netsurf-023167651aa8b25d29b8d7f3d4a633fcaa9193f0.tar.bz2 | |
Squash warnings in RISC OS build.
Replace use of strnlen with strlen and max.
svn path=/trunk/netsurf/; revision=10479
| -rw-r--r-- | riscos/query.c | 9 | ||||
| -rw-r--r-- | riscos/ucstables.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/riscos/query.c b/riscos/query.c index 8a0087feb..6401ad2b8 100644 --- a/riscos/query.c +++ b/riscos/query.c @@ -20,6 +20,7 @@ #include <string.h> #include <stdbool.h> + #include "riscos/dialog.h" #include "riscos/query.h" #include "riscos/wimp.h" @@ -177,8 +178,8 @@ query_id query_user_xy(const char *query, const char *detail, } icn = &query_template->icons[ICON_QUERY_YES]; - len = strnlen(local_text ? local_text : yes, - icn->data.indirected_text.size - 1); + len = strlen(local_text ? local_text : yes); + len = max(len, icn->data.indirected_text.size - 1); memcpy(icn->data.indirected_text.text, local_text ? local_text: yes, len); icn->data.indirected_text.text[len] = '\0'; @@ -207,8 +208,8 @@ query_id query_user_xy(const char *query, const char *detail, } icn = &query_template->icons[ICON_QUERY_NO]; - len = strnlen(local_text ? local_text : no, - icn->data.indirected_text.size - 1); + len = strlen(local_text ? local_text : no); + len = max(len, icn->data.indirected_text.size - 1); memcpy(icn->data.indirected_text.text, local_text ? local_text : no, len); icn->data.indirected_text.text[len] = '\0'; diff --git a/riscos/ucstables.c b/riscos/ucstables.c index 9b259766c..0a57022a1 100644 --- a/riscos/ucstables.c +++ b/riscos/ucstables.c @@ -23,8 +23,10 @@ #include <assert.h> #include <limits.h> #include <string.h> -#include "oslib/osbyte.h" -#include "oslib/territory.h" +#include <oslib/osbyte.h> +#include <oslib/territory.h> + +#include "utils/config.h" #include "riscos/ucstables.h" #include "utils/log.h" #include "utils/utf8.h" |