aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-27 01:25:34 +00:00
Code

guile: update deprecated string functions

Browse Source
This commit is contained in:
Felix Janda 2018-02-24 15:05:45 -05:00
parent a0a063f784
commit cec24f11a4
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/scripting/guile/hooks.c
View File

@ -67,12 +67,12 @@ script_hook_goto_url(va_list ap, void *data)
proc = get_guile_hook("%goto-url-hook"); proc = get_guile_hook("%goto-url-hook");
if (scm_is_false(proc)) return EVENT_HOOK_STATUS_NEXT; if (scm_is_false(proc)) return EVENT_HOOK_STATUS_NEXT;
x = scm_call_1(SCM_VARIABLE_REF(proc), scm_makfrom0str(*url)); x = scm_call_1(SCM_VARIABLE_REF(proc), scm_from_locale_string(*url));
if (scm_is_string(x)) { if (scm_is_string(x)) {
unsigned char *new_url; unsigned char *new_url;
new_url = stracpy(SCM_STRING_UCHARS(x)); new_url = stracpy((unsigned char *)scm_to_locale_string(x));
if (new_url) { if (new_url) {
mem_free_set(url, new_url); mem_free_set(url, new_url);
} }
@ -98,13 +98,12 @@ script_hook_follow_url(va_list ap, void *data)
proc = get_guile_hook("%follow-url-hook"); proc = get_guile_hook("%follow-url-hook");
if (scm_is_false(proc)) return EVENT_HOOK_STATUS_NEXT; if (scm_is_false(proc)) return EVENT_HOOK_STATUS_NEXT;
x = scm_call_1(SCM_VARIABLE_REF(proc), scm_makfrom0str(*url)); x = scm_call_1(SCM_VARIABLE_REF(proc), scm_from_locale_string(*url));
if (scm_is_string(x)) { if (scm_is_string(x)) {
unsigned char *new_url; unsigned char *new_url;
new_url = memacpy(SCM_STRING_UCHARS(x), new_url = stracpy((unsigned char *)scm_to_locale_string(x));
SCM_STRING_LENGTH(x) + 1);
if (new_url) { if (new_url) {
mem_free_set(url, new_url); mem_free_set(url, new_url);
} }
@ -121,7 +120,7 @@ script_hook_pre_format_html(va_list ap, void *data)
struct session *ses = va_arg(ap, struct session *); struct session *ses = va_arg(ap, struct session *);
struct cache_entry *cached = va_arg(ap, struct cache_entry *); struct cache_entry *cached = va_arg(ap, struct cache_entry *);
struct fragment *fragment = get_cache_fragment(cached); struct fragment *fragment = get_cache_fragment(cached);
unsigned char *url = struri(cached->uri); unsigned char *url = struri(cached->uri), *frag;
int len; int len;
SCM proc; SCM proc;
SCM x; SCM x;
@ -133,13 +132,13 @@ script_hook_pre_format_html(va_list ap, void *data)
proc = get_guile_hook("%pre-format-html-hook"); proc = get_guile_hook("%pre-format-html-hook");
if (scm_is_false(proc)) return EVENT_HOOK_STATUS_NEXT; if (scm_is_false(proc)) return EVENT_HOOK_STATUS_NEXT;
x = scm_call_2(SCM_VARIABLE_REF(proc), scm_makfrom0str(url), x = scm_call_2(SCM_VARIABLE_REF(proc), scm_from_locale_string(url),
scm_mem2string(fragment->data, fragment->length)); scm_from_locale_stringn(fragment->data, fragment->length));
if (!scm_is_string(x)) return EVENT_HOOK_STATUS_NEXT; if (!scm_is_string(x)) return EVENT_HOOK_STATUS_NEXT;
len = SCM_STRING_LENGTH(x); frag = (unsigned char *)scm_to_locale_stringn(x, &len);
add_fragment(cached, 0, SCM_STRING_UCHARS(x), len); add_fragment(cached, 0, frag, len);
normalize_cache_entry(cached, len); normalize_cache_entry(cached, len);
return EVENT_HOOK_STATUS_NEXT; return EVENT_HOOK_STATUS_NEXT;
@ -159,12 +158,12 @@ script_hook_get_proxy(va_list ap, void *data)
if (scm_is_false(proc)) return EVENT_HOOK_STATUS_NEXT; if (scm_is_false(proc)) return EVENT_HOOK_STATUS_NEXT;
x = scm_call_1(SCM_VARIABLE_REF(proc), scm_makfrom0str(url)); x = scm_call_1(SCM_VARIABLE_REF(proc), scm_from_locale_string(url));
evhook_use_params(retval && url); evhook_use_params(retval && url);
if (scm_is_string(x)) { if (scm_is_string(x)) {
mem_free_set(retval, memacpy(SCM_STRING_UCHARS(x), SCM_STRING_LENGTH(x)+1)); mem_free_set(retval, stracpy(scm_to_locale_string(x)));
} else if (scm_is_null(x)) { } else if (scm_is_null(x)) {
mem_free_set(retval, NULL); mem_free_set(retval, NULL);
} }