From 023167651aa8b25d29b8d7f3d4a633fcaa9193f0 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 24 Apr 2010 21:25:08 +0000 Subject: Squash warnings in RISC OS build. Replace use of strnlen with strlen and max. svn path=/trunk/netsurf/; revision=10479 --- riscos/query.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'riscos/query.c') 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 #include + #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'; -- cgit v1.2.3