TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Minor cleanups.

This commit is contained in:
Eelco Dolstra 2003-06-25 14:58:56 +00:00
parent 692b562342
commit 2b07b0e7eb
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.am
View File

@ -1,4 +1,4 @@
bin_PROGRAMS = nix # fix bin_PROGRAMS = nix
check_PROGRAMS = test check_PROGRAMS = test
AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I.. AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I..
@ -6,9 +6,6 @@ AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I..
nix_SOURCES = nix.cc nix_SOURCES = nix.cc
nix_LDADD = libnix.a -ldb_cxx-4 -lATerm nix_LDADD = libnix.a -ldb_cxx-4 -lATerm
#fix_SOURCES = fix.cc util.cc hash.cc md5.c
#fix_LDADD = -lATerm
TESTS = test TESTS = test
test_SOURCES = test.cc test_SOURCES = test.cc
@ -16,7 +13,8 @@ test_LDADD = libnix.a -ldb_cxx-4 -lATerm
noinst_LIBRARIES = libnix.a 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-data-local:
$(INSTALL) -d $(localstatedir)/nix $(INSTALL) -d $(localstatedir)/nix

4
src/nix.cc
View File

@ -60,7 +60,7 @@ static ArgType argType = atpUnknown;
/* Parse the `-f' / `-h' / `-n' flags, i.e., the type of value /* Parse the `-f' / `-h' / `-n' flags, i.e., the type of value
arguments. These flags are deleted from the referenced vector. */ arguments. These flags are deleted from the referenced vector. */
void getArgType(Strings & flags) static void getArgType(Strings & flags)
{ {
for (Strings::iterator it = flags.begin(); for (Strings::iterator it = flags.begin();
it != flags.end(); ) it != flags.end(); )
@ -215,7 +215,7 @@ static void opInit(Strings opFlags, Strings opArgs)
/* Initialize, process arguments, and dispatch to the right /* Initialize, process arguments, and dispatch to the right
operation. */ operation. */
void run(int argc, char * * argv) static void run(int argc, char * * argv)
{ {
/* Setup Nix paths. */ /* Setup Nix paths. */
nixValues = NIX_VALUES_DIR; nixValues = NIX_VALUES_DIR;