From 88c07341a6bf99f923cb3d6487b72afc025b7746 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Sep 2013 15:56:33 +0200 Subject: nix-env: Use wildcard match by default That is, you don't need to pass '*' anymore, so nix-env -qa is equivalent to nix-env -qa '*' --- src/libexpr/names.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/libexpr') diff --git a/src/libexpr/names.cc b/src/libexpr/names.cc index 29c7ddb4d70f..781c2b6468f9 100644 --- a/src/libexpr/names.cc +++ b/src/libexpr/names.cc @@ -55,7 +55,7 @@ static string nextComponent(string::const_iterator & p, else while (p != end && (!isdigit(*p) && *p != '.' && *p != '-')) s += *p++; - + return s; } @@ -80,7 +80,7 @@ int compareVersions(const string & v1, const string & v2) { string::const_iterator p1 = v1.begin(); string::const_iterator p2 = v2.begin(); - + while (p1 != v1.end() || p2 != v2.end()) { string c1 = nextComponent(p1, v1.end()); string c2 = nextComponent(p2, v2.end()); @@ -95,11 +95,10 @@ int compareVersions(const string & v1, const string & v2) DrvNames drvNamesFromArgs(const Strings & opArgs) { DrvNames result; - for (Strings::const_iterator i = opArgs.begin(); - i != opArgs.end(); ++i) + foreach (Strings::const_iterator, i, opArgs) result.push_back(DrvName(*i)); return result; } - + } -- cgit 1.4.1