summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2002-09-04 12:28:43 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2002-09-04 12:28:43 +0000
commitb2bc0918ba229ac6cce6c458f0999c9d360358bb (patch)
treeff24f621c9553b617f0060373c9c7bd6e0e619b3
parent2bc6d91f21c1c5817ce3b8f2ff3d848f22b3d421 (diff)
remove some unnecessary casts and adjust format strings
looked over by dhartmei@
-rw-r--r--usr.sbin/httpd/src/main/http_main.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/httpd/src/main/http_main.c b/usr.sbin/httpd/src/main/http_main.c
index 2757a45aea5..9dc60c7ab87 100644
--- a/usr.sbin/httpd/src/main/http_main.c
+++ b/usr.sbin/httpd/src/main/http_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: http_main.c,v 1.22 2002/07/31 09:02:28 henning Exp $ */
+/* $OpenBSD: http_main.c,v 1.23 2002/09/04 12:28:42 henning Exp $ */
/* ====================================================================
* The Apache Software License, Version 1.1
@@ -4348,7 +4348,7 @@ static void child_main(int child_num_arg)
#endif
setuid(ap_user_id) == -1)) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change to uid: %ld", (long) ap_user_id);
+ "setuid: unable to change to uid: %u", ap_user_id);
clean_child_exit(APEXIT_CHILDFATAL);
}
#endif
@@ -5222,8 +5222,8 @@ static void standalone_main(int argc, char **argv)
exit(1);
} else
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
- server_conf, "changed to uid %ld, gid %ld",
- (long)ap_user_id, (long)ap_group_id);
+ server_conf, "changed to uid %u, gid %u",
+ ap_user_id, ap_group_id);
} else
setproctitle("parent");
@@ -5372,8 +5372,8 @@ static void standalone_main(int argc, char **argv)
if ( pidfile != NULL && unlink(pidfile) == 0)
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
server_conf,
- "removed PID file %s (pid=%ld)",
- pidfile, (long)getpid());
+ "removed PID file %s (pid=%u)",
+ pidfile, getpid());
}
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
@@ -5701,8 +5701,8 @@ int REALMAIN(int argc, char *argv[])
if (!geteuid() && setuid(ap_user_id) == -1) {
#endif
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
- "setuid: unable to change to uid: %ld",
- (long) ap_user_id);
+ "setuid: unable to change to uid: %u",
+ ap_user_id);
exit(1);
}
#endif
@@ -7235,8 +7235,8 @@ die_now:
if ( pidfile != NULL && unlink(pidfile) == 0)
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
server_conf,
- "removed PID file %s (pid=%ld)",
- pidfile, (long)getpid());
+ "removed PID file %s (pid=%u)",
+ pidfile, getpid());
}
if (pparent) {