Prefer build_unibyte_string where applicable

* src/fns.c (syms_of_fns):
* src/image.c (slurp_image): Prefer build_unibyte_string (str) to
make_unibyte_string (str, strlen (str)).
* admin/coccinelle/unibyte_string.cocci: Support string literals.

diff --git a/admin/coccinelle/unibyte_string.cocci b/admin/coccinelle/unibyte_string.cocci
index 0ff8cafa15d9075260f1fd97cd0d39039e6acc17..97f87e5a4ca05c180ef9dd7840bec46117797412 100644 (file)
--- a/admin/coccinelle/unibyte_string.cocci
+++ b/admin/coccinelle/unibyte_string.cocci
@@ -4,3 +4,9 @@ identifier I;
 @@
 - make_unibyte_string (I, strlen (I))
 + build_unibyte_string (I)
+
+@@
+constant C;
+@@
+- make_unibyte_string (C, strlen (C))
++ build_unibyte_string (C)

diff --git a/src/fns.c b/src/fns.c
index 05b7fe85601a6df2af8060e65715c0f21c568975..c03aea0239733111ca4f0f237f7e7e41385f02f7 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -6337,7 +6337,7 @@ The same variable also affects the function `read-answer'.  See also
   DEFVAR_LISP ("yes-or-no-prompt", Vyes_or_no_prompt,
     doc: /* String to append when `yes-or-no-p' asks a question.
 For best results this should end in a space.  */);
-  Vyes_or_no_prompt = make_unibyte_string ("(yes or no) ", strlen ("(yes or no) "));
+  Vyes_or_no_prompt = build_unibyte_string ("(yes or no) ");
 
   defsubr (&Sidentity);
   defsubr (&Srandom);

diff --git a/src/image.c b/src/image.c
index dea2730832b69d18d14ce2df6370f4d122dbc2e1..252b83da992e27a59f9d98dd44cdf8a1dbab23c0 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -4373,7 +4373,7 @@ slurp_image (Lisp_Object filename, ptrdiff_t *size, const char *image_type)
   char *result = slurp_file (fd, size);
   if (result == NULL)
     image_error ("Error loading %s image `%s'",
-                make_unibyte_string (image_type, strlen (image_type)),
+                build_unibyte_string (image_type),
                 file);
   return result;
 }