commit

diff --git a/meta b/meta
index c0fbe7172ad77e7b74b00d7552b39a442e87b36d..954c2b50351bd2fefd479b82a0f7ce534d8d30d2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 933e16341ee3e823418debbc534666b738eb44de
+Previous: 12b809026bd92808a9cdd43680901cbc69fc8b28
 Head: 3b1f7191c890140c64eb9972876b4e56955a65ca
 Applied:
-  range: 1a80d1d2efa888ad294bac3e681f744555d4e816
   format_lid: 3d001d786a9894e9a7e86932685e7c43568484b5
   query_path: 3b1f7191c890140c64eb9972876b4e56955a65ca
 Unapplied:

diff --git a/patches/range b/patches/range
deleted file mode 100644 (file)
index 206c5e5..0000000
--- a/patches/range
+++ /dev/null
@@ -1,37 +0,0 @@
-Bottom: 1ab5f7833d1baaba821d175e19964a67ad69afe5
-Top:    95be46d944a0b8ad21ebe86340c99c1691ee887f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-17 12:06:05 -0800
-
-ib_acme: Support range of DLIDs for lookups
-
-Allow the user to specify multiple DLIDs as part of
-querying.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/src/parse.c b/src/parse.c
-index e90fb09..d1c820f 100644
---- a/src/parse.c
-+++ b/src/parse.c
-@@ -80,8 +80,15 @@ char **parse(char *args, int *count)
-       cpy = malloc(strlen(args) + 1);
-       strcpy(cpy, args);
- 
--      token = strtok(cpy, "[");
--      next = strtok(NULL, "]");
-+      if (args[0] == '[') {
-+              cpy[0] = '\0';
-+              token = cpy;
-+              next = strtok(cpy + 1, "]");
-+      } else {
-+              token = strtok(cpy, "[");
-+              next = strtok(NULL, "]");
-+      }
-+
-       if (!next) {
-               str_size = strlen(token) + 1;
-               str_buf = malloc(str_size);