Changeset f3386d7 in mainline for uspace/app/inet/inet.c

Timestamp:

2013-07-15T20:44:54Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f8d3df3

Parents:

273c976 (diff), a940f1d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

File:

• uspace/app/inet/inet.c (modified) (5 diffs)

uspace/app/inet/inet.c

@@ -44 +44 @@
 #include <sys/types.h>
 
-#define NAME "inet"
+#define NAME  "inet"
 
 static void print_syntax(void)
@@ -257 +257 @@
         if (count > 0)
                 printf("    [Addr/Width] [Link-Name] [Addr-Name] [Def-MTU]\n");
-        ainfo.name = linfo.name = astr = NULL;
+        ainfo.name = NULL;
+        linfo.name = NULL;
+        astr = NULL;
 
         for (i = 0; i < count; i++) {
@@ -290 +292 @@
                 free(astr);
 
-                ainfo.name = linfo.name = astr = NULL;
+                ainfo.name = NULL;
+                linfo.name = NULL;
+                astr = NULL;
         }
 
@@ -329 +333 @@
                 printf("    [Dest/Width] [Router-Addr] [Route-Name]\n");
 
-        srinfo.name = dest_str = router_str = NULL;
+        srinfo.name = NULL;
+        dest_str = NULL;
+        router_str = NULL;
 
         for (i = 0; i < count; i++) {
@@ -360 +366 @@
                 free(router_str);
 
-                router_str = srinfo.name = dest_str = NULL;
+                router_str = NULL;
+                srinfo.name = NULL;
+                dest_str = NULL;
         }