* dbusbind.c (Fdbus_register_signal):

* process.c (conv_sockaddr_to_lisp):
* w32fns.c (Fw32_battery_status): Use empty_unibyte_string.

4 files changed, 14 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c9d8f444453..91714a83273 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2009-01-18  Juanma Barranquero  <lekktu@gmail.com>
 
+        * dbusbind.c (Fdbus_register_signal):
+        * process.c (conv_sockaddr_to_lisp):
+        * w32fns.c (Fw32_battery_status): Use empty_unibyte_string.
+
         * callproc.c (Fgetenv_internal): Doc fix.
 
 2009-01-16  Chong Yidong  <cyd@stupidchicken.com>
@@ -24,21 +28,19 @@
 2009-01-14  Jason Rumney  <jasonr@gnu.org>
 
         * frame.c (x_set_font): Always store a font to the font parameter,
-        never a fontset. (Bug#1562)
+        never a fontset.  (Bug#1562)
 
 2009-01-14  Kenichi Handa  <handa@m17n.org>
 
         * coding.c (TWO_MORE_BYTES): New macro.
-        (detect_coding_utf_16): Use TWO_MORE_BYTES instead of
-        ONE_MORE_BYTE.
+        (detect_coding_utf_16): Use TWO_MORE_BYTES instead of ONE_MORE_BYTE.
 
 2009-01-13  Chong Yidong  <cyd@stupidchicken.com>
 
         * font.c (font_clear_prop): If clearing the family, clear the font
         width index too.
 
-        * xfaces.c (Finternal_set_lisp_face_attribute): Revert last
-        change.
+        * xfaces.c (Finternal_set_lisp_face_attribute): Revert last change.
 
 2009-01-12  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -82,7 +84,7 @@
 2009-01-09  Jason Rumney  <jasonr@gnu.org>
 
         * w32font.c (add_font_entity_to_list): Don't report unknown
-        Windows charset as any unrecognized registry. (Bug#1548)
+        Windows charset as any unrecognized registry.  (Bug#1548)
         Only report Unicode Plane 2 fonts as unicode-sip.
 
 2009-01-09  Chong Yidong  <cyd@stupidchicken.com>
@@ -118,7 +120,7 @@
         (Vx_mode_pointer_shape, Vx_window_horizontal_drag_shape)
         (Vx_hourglass_pointer_shape, Vx_sensitive_text_pointer_shape):
         Don't declare.
-        (syms_of_w32fns): Don't define x-pointer-shape variable. (Bug#1485)
+        (syms_of_w32fns): Don't define x-pointer-shape variable.  (Bug#1485)
         (x_create_tip_frame) [GLYPH_DEBUG]: Enable image debugging code.
 
 2009-01-07  Kenichi Handa  <handa@m17n.org>
diff --git a/src/dbusbind.c b/src/dbusbind.c
index a6a7ef706f6..6e97f168ea4 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -1659,7 +1659,7 @@ usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARG
       /* When there is no unique name, we mark it with an empty
          string.  */
       if (NILP (uname))
-        uname = build_string ("");
+        uname = empty_unibyte_string;
     }
   else
     uname = service;
diff --git a/src/process.c b/src/process.c
index b3271d3a2e9..b6b4d3478a1 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2271,7 +2271,7 @@ conv_sockaddr_to_lisp (sa, len)
      sockets in the UNIX domain are inaccessible; getsockname returns
      a zero length name.  */
   if (len < OFFSETOF (struct sockaddr, sa_family) + sizeof (sa->sa_family))
-    return build_string ("");
+    return empty_unibyte_string;
 
   switch (sa->sa_family)
     {
diff --git a/src/w32fns.c b/src/w32fns.c
index 14caa4662df..70964cb8667 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6594,7 +6594,7 @@ The following %-sequences are provided:
       if (system_status.BatteryFlag & 128)
         {
           battery_status = build_string ("N/A");
-          battery_status_symbol = build_string ("");
+          battery_status_symbol = empty_unibyte_string;
         }
       else if (system_status.BatteryFlag & 8)
         {
@@ -6616,12 +6616,12 @@ The following %-sequences are provided:
       else if (system_status.BatteryFlag & 1)
         {
           battery_status = build_string ("high");
-          battery_status_symbol = build_string ("");
+          battery_status_symbol = empty_unibyte_string;
         }
       else
         {
           battery_status = build_string ("medium");
-          battery_status_symbol = build_string ("");
+          battery_status_symbol = empty_unibyte_string;
         }
 
       if (system_status.BatteryLifePercent > 100)