From d7ea76b4f34c4e2c43bf0b1deeedde354ca540f7 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Fri, 20 Jul 2012 11:29:04 +0400 Subject: Simple wrapper for make_unibyte_string, adjust font_open_by_name. * src/lisp.h (build_unibyte_string): New function. * src/dosfns.c, src/fileio.c, src/fns.c, src/ftfont.c, src/process.c: * src/sysdep.c, src/w32fns.c, src/xfns.c: Use it. * src/font.c (font_open_by_name): Change 2nd and 3rd args to the only arg of type Lisp_Object to avoid redundant calls to make_unibyte_string. Adjust users accordingly. * src/font.h (font_open_by_name): Adjust prototype. * admin/coccinelle/unibyte_string.cocci: Semantic patch to convert from make_unibyte_string to build_unibyte_string where appropriate. --- src/dosfns.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dosfns.c') diff --git a/src/dosfns.c b/src/dosfns.c index ee28801e841..6fd1b52e252 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -562,7 +562,7 @@ system_process_attributes (Lisp_Object pid) attrs = Fcons (Fcons (Qgroup, build_string (gr->gr_name)), attrs); strcpy (cmd, basename (__crt0_argv[0])); /* Command name is encoded in locale-coding-system; decode it. */ - cmd_str = make_unibyte_string (cmd, strlen (cmd)); + cmd_str = build_unibyte_string (cmd); decoded_cmd = code_convert_string_norecord (cmd_str, Vlocale_coding_system, 0); attrs = Fcons (Fcons (Qcomm, decoded_cmd), attrs); @@ -630,7 +630,7 @@ system_process_attributes (Lisp_Object pid) q[-1] = '\0'; /* Command line is encoded in locale-coding-system; decode it. */ - cmd_str = make_unibyte_string (cmdline, strlen (cmdline)); + cmd_str = build_unibyte_string (cmdline); decoded_cmd = code_convert_string_norecord (cmd_str, Vlocale_coding_system, 0); xfree (cmdline); -- cgit v1.2.1