* editfns.c (get_system_name): Remove.

* lisp.h (get_system_name): Remove prototype.
* xrdb.c (getenv, getpwuid, getpwnam): Remove prototypes.
(get_environ_db): Use Vsystem_name.  Avoid call to strlen.

diff --git a/src/ChangeLog b/src/ChangeLog
index 398eda841fe8ae371784a3e898d86422f20f406e..26bd1925a5f9c787977f3f0f38020fce8edf2b73 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-16  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * editfns.c (get_system_name): Remove.
+       * lisp.h (get_system_name): Remove prototype.
+       * xrdb.c (getenv, getpwuid, getpwnam): Remove prototypes.
+       (get_environ_db): Use Vsystem_name.  Avoid call to strlen.
+
 2012-10-15  Daniel Colascione  <dancol@dancol.org>
 
        * dbusbind.c: Add comment explaining reason for previous change.

diff --git a/src/editfns.c b/src/editfns.c
index 19fad7130a766d1bb7255b5a8753e9f35e9d2374..c5d4ed295ab05cde25b4c41d3864b9f221b888d8 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1339,15 +1339,6 @@ DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0,
   return Vsystem_name;
 }
 
-const char *
-get_system_name (void)
-{
-  if (STRINGP (Vsystem_name))
-    return SSDATA (Vsystem_name);
-  else
-    return "";
-}
-
 DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0,
        doc: /* Return the process ID of Emacs, as a number.  */)
   (void)

diff --git a/src/lisp.h b/src/lisp.h
index 7afe7b373fe33c9db22e21498c9b1b5a81d23366..01f6ca5e57c8a783c519586e82f90ffd1cf922f9 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3127,7 +3127,6 @@ extern Lisp_Object make_buffer_string (ptrdiff_t, ptrdiff_t, bool);
 extern Lisp_Object make_buffer_string_both (ptrdiff_t, ptrdiff_t, ptrdiff_t,
                                            ptrdiff_t, bool);
 extern void init_editfns (void);
-const char *get_system_name (void);
 extern void syms_of_editfns (void);
 extern void set_time_zone_rule (const char *);
 

diff --git a/src/xrdb.c b/src/xrdb.c
index 73672c9617c78aad31ddb57210ca7052bb11d6a9..9d056a607e409da95235eb172d89947d3ebeb78b 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -24,7 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #include <errno.h>
 #include <epaths.h>
-
+#include <stdlib.h>
 #include <stdio.h>
 
 #include "lisp.h"
@@ -48,11 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "keyboard.h"
 #endif
 
-extern char *getenv (const char *);
-
-extern struct passwd *getpwuid (uid_t);
-extern struct passwd *getpwnam (const char *);
-
 char *x_get_string_resource (XrmDatabase rdb, const char *name,
                             const char *class);
 static int file_p (const char *filename);
@@ -429,8 +424,9 @@ get_environ_db (void)
     {
       static char const xdefaults[] = ".Xdefaults-";
       char *home = gethomedir ();
-      char const *host = get_system_name ();
-      ptrdiff_t pathsize = strlen (home) + sizeof xdefaults + strlen (host);
+      char const *host = SSDATA (Vsystem_name);
+      ptrdiff_t pathsize = (strlen (home) + sizeof xdefaults
+                           + SBYTES (Vsystem_name));
       path = xrealloc (home, pathsize);
       strcat (strcat (path, xdefaults), host);
       p = path;