scratch/no-purespace 820b8fcb580 1/3: Fixup for "Pure storage removal: Replace calls to removed functions"

[Pip Cet]

branch: scratch/no-purespace
commit 820b8fcb580e5902df2c7125bbdb280ba63c81c0
Author: Pip Cet <pipcet@protonmail.com>
Commit: Pip Cet <pipcet@protonmail.com>

    Fixup for "Pure storage removal: Replace calls to removed functions"
    
    * src/androidterm.c (android_term_init): Replace call to
    'build_pure_c_string'.
    * src/haikufns.c (syms_of_haikufns):
    * src/lread.c (syms_of_lread):
    * src/pgtkfns.c (syms_of_pgtkfns):
    * src/pgtkterm.c (syms_of_pgtkterm):
    * src/xftfont.c (syms_of_xftfont): Replace calls to
    'build_pure_c_string' etc.
---
 src/androidterm.c | 2 +-
 src/haikufns.c    | 2 +-
 src/lread.c       | 2 +-
 src/pgtkfns.c     | 4 ++--
 src/pgtkterm.c    | 2 +-
 src/xftfont.c     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/androidterm.c b/src/androidterm.c
index 4561f2d1df3..c0470176489 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -6632,7 +6632,7 @@ android_term_init (void)
   x_display_list = dpyinfo;
 
   dpyinfo->name_list_element
-    = Fcons (build_pure_c_string ("android"), Qnil);
+    = Fcons (build_string ("android"), Qnil);
 
   color_file = Fexpand_file_name (build_string ("rgb.txt"),
                                  Vdata_directory);
diff --git a/src/haikufns.c b/src/haikufns.c
index b4b88b434e4..c92dfe64ebc 100644
--- a/src/haikufns.c
+++ b/src/haikufns.c
@@ -3300,7 +3300,7 @@ invalid color.  */);
     int len = sprintf (cairo_version, "%d.%d.%d",
                       CAIRO_VERSION_MAJOR, CAIRO_VERSION_MINOR,
                        CAIRO_VERSION_MICRO);
-    Vcairo_version_string = make_pure_string (cairo_version, len, len, false);
+    Vcairo_version_string = make_specified_string (cairo_version, len, len, 
false);
   }
 #endif
 
diff --git a/src/lread.c b/src/lread.c
index b11591ee492..55c2c5688f3 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -6106,7 +6106,7 @@ through `require'.  */);
 #if !IEEE_FLOATING_POINT
   for (int negative = 0; negative < 2; negative++)
     {
-      not_a_number[negative] = build_pure_c_string (&"-0.0e+NaN"[!negative]);
+      not_a_number[negative] = build_string (&"-0.0e+NaN"[!negative]);
       staticpro (&not_a_number[negative]);
     }
 #endif
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index f0fd3000965..42a7609b066 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -3847,7 +3847,7 @@ syms_of_pgtkfns (void)
                                 GTK_MAJOR_VERSION, GTK_MINOR_VERSION,
                                 GTK_MICRO_VERSION);
     int len = strlen (ver);
-    Vgtk_version_string = make_pure_string (ver, len, len, false);
+    Vgtk_version_string = make_specified_string (ver, len, len, false);
     g_free (ver);
   }
 
@@ -3861,7 +3861,7 @@ syms_of_pgtkfns (void)
                                 CAIRO_VERSION_MAJOR, CAIRO_VERSION_MINOR,
                                 CAIRO_VERSION_MICRO);
     int len = strlen (ver);
-    Vcairo_version_string = make_pure_string (ver, len, len, false);
+    Vcairo_version_string = make_specified_string (ver, len, len, false);
     g_free (ver);
   }
 
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 950c4290579..5b55c1b488d 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -7422,7 +7422,7 @@ syms_of_pgtkterm (void)
   DEFSYM (Qlatin_1, "latin-1");
 
   xg_default_icon_file
-    = build_pure_c_string ("icons/hicolor/scalable/apps/emacs.svg");
+    = build_string ("icons/hicolor/scalable/apps/emacs.svg");
   staticpro (&xg_default_icon_file);
 
   DEFSYM (Qx_gtk_map_stock, "x-gtk-map-stock");
diff --git a/src/xftfont.c b/src/xftfont.c
index 41941509bc2..489a343d4e8 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -810,7 +810,7 @@ do not actually have glyphs with colors that can cause Xft 
crashes.
 
 The font families in this list will not be ignored when
 `xft-ignore-color-fonts' is non-nil.  */);
-  Vxft_color_font_whitelist = list1 (build_pure_c_string ("Source Code Pro"));
+  Vxft_color_font_whitelist = list1 (build_string ("Source Code Pro"));
 
   pdumper_do_now_and_after_load (syms_of_xftfont_for_pdumper);
 }