From 23431241d4e077e1eb18f7ed490c5e101d58347d Mon Sep 17 00:00:00 2001 From: Dave Love Date: Thu, 5 Apr 2001 18:46:47 +0000 Subject: [PATCH] (fail): Don't return a value. (main): Cast uid values for sprintf. --- lib-src/ChangeLog | 5 +++++ lib-src/emacsclient.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 88fd797d02..2db9dd6729 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2001-04-05 Dave Love + + * emacsclient.c (fail): Don't return a value. + (main): Cast uid values for sprintf. + 2001-04-03 Gerd Moellmann * emacsclient.c (fail, main): Don't use implicit int return type. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 10f95decd8..f16b126b75 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -188,6 +188,7 @@ fail (argc, argv) { int i = optind -1 ; execvp (alternate_editor, argv + i); + return; } else { @@ -305,7 +306,7 @@ main (argc, argv) { int sock_status = 0; - sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name); + sprintf (server.sun_path, "/tmp/esrv%d-%s", (int) geteuid (), system_name); /* See if the socket exists, and if it's owned by us. */ sock_status = socket_status (server.sun_path); @@ -327,7 +328,7 @@ main (argc, argv) { /* We're running under su, apparently. */ sprintf (server.sun_path, "/tmp/esrv%d-%s", - pw->pw_uid, system_name); + (int) pw->pw_uid, system_name); sock_status = socket_status (server.sun_path); } } -- 2.20.1