From 2b07b0e7ebee69e6a64013dcdda363c393d3f4fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed, 25 Jun 2003 14:58:56 +0000
Subject: [PATCH] * Minor cleanups.

---
 src/Makefile.am | 8 +++-----
 src/nix.cc      | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index afe34ba5ff..4d8cd4229e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = nix # fix
+bin_PROGRAMS = nix
 check_PROGRAMS = test
 
 AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I..
@@ -6,9 +6,6 @@ AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I..
 nix_SOURCES = nix.cc
 nix_LDADD = libnix.a -ldb_cxx-4 -lATerm
 
-#fix_SOURCES = fix.cc util.cc hash.cc md5.c
-#fix_LDADD = -lATerm
-
 TESTS = test
 
 test_SOURCES = test.cc
@@ -16,7 +13,8 @@ test_LDADD = libnix.a -ldb_cxx-4 -lATerm
 
 noinst_LIBRARIES = libnix.a
 
-libnix_a_SOURCES = util.cc hash.cc archive.cc md5.c eval.cc values.cc globals.cc db.cc
+libnix_a_SOURCES = util.cc hash.cc archive.cc md5.c \
+ eval.cc values.cc globals.cc db.cc
 
 install-data-local:
 	$(INSTALL) -d $(localstatedir)/nix
diff --git a/src/nix.cc b/src/nix.cc
index 9b21f0379c..fe9ab453b2 100644
--- a/src/nix.cc
+++ b/src/nix.cc
@@ -60,7 +60,7 @@ static ArgType argType = atpUnknown;
 
 /* Parse the `-f' / `-h' / `-n' flags, i.e., the type of value
    arguments.  These flags are deleted from the referenced vector. */
-void getArgType(Strings & flags)
+static void getArgType(Strings & flags)
 {
     for (Strings::iterator it = flags.begin();
          it != flags.end(); )
@@ -215,7 +215,7 @@ static void opInit(Strings opFlags, Strings opArgs)
 
 /* Initialize, process arguments, and dispatch to the right
    operation. */
-void run(int argc, char * * argv)
+static void run(int argc, char * * argv)
 {
     /* Setup Nix paths. */
     nixValues = NIX_VALUES_DIR;