From da8c26533d101f5e90d7c2d829441c0f2c48a63b Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 29 Dec 2009 17:03:50 +0000 Subject: [PATCH] Unix: Merge aklog with aklog_main Historically, aklog was split into aklog.c (which just contained a wrapper) and aklog_main.c, which did all of the hard work. Now that we've purged all of the Windows code from aklog_main.c, we can merge them both into the same file, so do so. FIXES 20884 Change-Id: Ifdcb33f4eb2b26703c833056882d95f7f0f654b1 Reviewed-on: http://gerrit.openafs.org/1036 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/aklog/Makefile.in | 4 ++-- src/aklog/aklog.c | 17 ----------------- src/aklog/aklog_main.c | 2 +- 3 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 src/aklog/aklog.c diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in index e3add4031a..6008c52db0 100644 --- a/src/aklog/Makefile.in +++ b/src/aklog/Makefile.in @@ -18,8 +18,8 @@ AFSLIBS = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/libdes.a ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a -SRCS= aklog.c aklog_main.c krb_util.c linked_list.c -OBJS= aklog.o aklog_main.o krb_util.o linked_list.o +SRCS= aklog_main.c krb_util.c linked_list.c +OBJS= aklog_main.o krb_util.o linked_list.o all: aklog asetkey klog diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c deleted file mode 100644 index cdca70002b..0000000000 --- a/src/aklog/aklog.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * $Id$ - * - * Copyright 1990,1991 by the Massachusetts Institute of Technology - * For distribution and copying rights, see the file "mit-copyright.h" - */ - -#include -#include "aklog.h" - -int -main(int argc, char *argv[]) -{ - aklog(argc, argv); - exit(0); -} - diff --git a/src/aklog/aklog_main.c b/src/aklog/aklog_main.c index bc23117e0d..1d8a380a3c 100644 --- a/src/aklog/aklog_main.c +++ b/src/aklog/aklog_main.c @@ -1245,7 +1245,7 @@ static void usage(void) exit(AKLOG_USAGE); } -void aklog(int argc, char *argv[]) +int main(int argc, char *argv[]) { krb5_context context; int status = AKLOG_SUCCESS;