Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/2f663987c558077f34505ea28dce183678d8175e
...commit
http://git.netsurf-browser.org/netsurf.git/commit/2f663987c558077f34505ea28dce183678d8175e
...tree
http://git.netsurf-browser.org/netsurf.git/tree/2f663987c558077f34505ea28dce183678d8175e
The branch, master has been updated
via 2f663987c558077f34505ea28dce183678d8175e (commit)
from 16cc1121e30d3194cbf04d23cb5b11273e45250d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=2f663987c558077f34505ea28dce183678d8175e
commit 2f663987c558077f34505ea28dce183678d8175e
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
do not use strlen as a variable name
diff --git a/frontends/gtk/login.c b/frontends/gtk/login.c
index 7cb45b2..96639fa 100644
--- a/frontends/gtk/login.c
+++ b/frontends/gtk/login.c
@@ -121,7 +121,7 @@ get_login_description(struct nsurl *url,
size_t url_l;
nserror res;
char *str = NULL;
- int strlen;
+ int slen;
const char *key;
res = nsurl_get(url, NSURL_SCHEME | NSURL_HOST, &url_s, &url_l);
@@ -144,12 +144,12 @@ get_login_description(struct nsurl *url,
} else {
/* no message so fallback */
const char *fmt = "The site %s is requesting your username and
password. The realm is \"%s\"";
- strlen = snprintf(str, 0, fmt, url_s, realm) + 1;
- str = malloc(strlen);
+ slen = snprintf(str, 0, fmt, url_s, realm) + 1;
+ str = malloc(slen);
if (str == NULL) {
res = NSERROR_NOMEM;
} else {
- snprintf(str, strlen, fmt, url_s, realm);
+ snprintf(str, slen, fmt, url_s, realm);
*out_str = str;
}
}
-----------------------------------------------------------------------
Summary of changes:
frontends/gtk/login.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/frontends/gtk/login.c b/frontends/gtk/login.c
index 7cb45b2..96639fa 100644
--- a/frontends/gtk/login.c
+++ b/frontends/gtk/login.c
@@ -121,7 +121,7 @@ get_login_description(struct nsurl *url,
size_t url_l;
nserror res;
char *str = NULL;
- int strlen;
+ int slen;
const char *key;
res = nsurl_get(url, NSURL_SCHEME | NSURL_HOST, &url_s, &url_l);
@@ -144,12 +144,12 @@ get_login_description(struct nsurl *url,
} else {
/* no message so fallback */
const char *fmt = "The site %s is requesting your username and
password. The realm is \"%s\"";
- strlen = snprintf(str, 0, fmt, url_s, realm) + 1;
- str = malloc(strlen);
+ slen = snprintf(str, 0, fmt, url_s, realm) + 1;
+ str = malloc(slen);
if (str == NULL) {
res = NSERROR_NOMEM;
} else {
- snprintf(str, strlen, fmt, url_s, realm);
+ snprintf(str, slen, fmt, url_s, realm);
*out_str = str;
}
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
