refresh

diff --git a/meta b/meta
index 02b13b42e52984612e08c28833181f0631703e8a..4aa34ccdf789f9a76fd8c52b494d40dc3cf0cf71 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 46f48f5abcad1f5788716c435cf2a74ae5ccc70a
-Head: fb9138ac99ffcb2783cb4593a1e297999f535990
+Previous: d1842d743b4369f97f55a1a5fc7a9e78e088e1e0
+Head: 5ae12adc5bb0664936f36a30753be74378ab7040
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -16,8 +16,7 @@ Applied:
   nodelay: 90b41e985e1f478cda3e4821709cb2ed5e27ee7f
   acme_dest: b7ec8fce4adac1b6e970529e41ff1c936f4be27b
   show_err: 47d8e33e2f36df1e3b163fcf7e8b0b56604fb944
-  mult_dest: ce87a2b0e66cea053603c29aa084aca863f7644e
-  refresh-temp: fb9138ac99ffcb2783cb4593a1e297999f535990
+  mult_dest: 5ae12adc5bb0664936f36a30753be74378ab7040
 Unapplied:
   1.0.4: dc3f68d964641c9ffea14558d6a236c4216a89ae
 Hidden:

diff --git a/patches/mult_dest b/patches/mult_dest
index d1d4e8f20ce6fac95047f94f0455e787dbdcb393..e3f85ef68d19ccba0d1735f45407386f42f2f1bc 100644 (file)
--- a/patches/mult_dest
+++ b/patches/mult_dest
@@ -1,5 +1,5 @@
 Bottom: 32a7b8b2ffc23b410dc19c50a9bf68e149662635
-Top:    d3c7a806f212c9f20c9f09ed867e4cd02850eab7
+Top:    632943322bbfcb0df14ab3a85bb99d324acd8545
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-07 09:39:52 -0800
 
@@ -50,7 +50,7 @@ index 56c49f0..de212fb 100644
  \-v\r
  Indicates that the resolved path information should be verified with the\r
 diff --git a/src/acme.c b/src/acme.c
-index 7e1ca5e..6e82765 100644
+index 7e1ca5e..cbb5345 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -60,6 +60,7 @@ struct ibv_context **verbs;
@@ -75,7 +75,7 @@ index 7e1ca5e..6e82765 100644
  
        ret = libacm_init();
        if (ret) {
-@@ -523,28 +525,37 @@ static int resolve(char *program)
+@@ -523,28 +525,38 @@ static int resolve(char *program)
                return ret;
        }
  
@@ -102,6 +102,7 @@ index 7e1ca5e..6e82765 100644
 -      if (!ret)
 -              show_path(&path);
 +      for (dest_addr = dest_list[i]; dest_addr; dest_addr = dest_list[++i]) {
++              printf("Destination: %s\n", dest_addr);
 +              switch (addr_type) {
 +              case 'i':
 +                      ret = resolve_ip(&path);
@@ -131,15 +132,15 @@ index 7e1ca5e..6e82765 100644
        libacm_cleanup();
        return ret;
  }
-@@ -562,6 +573,7 @@ char *opt_arg(int argc, char **argv)
+@@ -562,6 +574,7 @@ char *opt_arg(int argc, char **argv)
  
  int CDECL_FUNC main(int argc, char **argv)
  {
-+      char *dest_arg;
++      char *dest_arg = NULL;
        int op, ret;
  
        ret = osd_init();
-@@ -577,7 +589,7 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -577,7 +590,7 @@ int CDECL_FUNC main(int argc, char **argv)
                        src_addr = optarg;
                        break;
                case 'd':
@@ -148,7 +149,7 @@ index 7e1ca5e..6e82765 100644
                        break;
                case 'v':
                        verify = 1;
-@@ -607,14 +619,14 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -607,14 +620,14 @@ int CDECL_FUNC main(int argc, char **argv)
                }
        }
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d2e9128..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: d3c7a806f212c9f20c9f09ed867e4cd02850eab7
-Top:    632943322bbfcb0df14ab3a85bb99d324acd8545
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-07 11:05:54 -0800
-
-Refresh of mult_dest
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 6e82765..cbb5345 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -532,6 +532,7 @@ static int resolve(char *program, char *dest_arg)
-       }
- 
-       for (dest_addr = dest_list[i]; dest_addr; dest_addr = dest_list[++i]) {
-+              printf("Destination: %s\n", dest_addr);
-               switch (addr_type) {
-               case 'i':
-                       ret = resolve_ip(&path);
-@@ -573,7 +574,7 @@ char *opt_arg(int argc, char **argv)
- 
- int CDECL_FUNC main(int argc, char **argv)
- {
--      char *dest_arg;
-+      char *dest_arg = NULL;
-       int op, ret;
- 
-       ret = osd_init();