Changeset 8e7c9fe in mainline for uspace/app/bdsh/compl.c

Timestamp:

2014-09-12T03:45:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/app/bdsh/compl.c (modified) (2 diffs)

uspace/app/bdsh/compl.c

@@ -209 +209 @@
                 *cstart += rpath_sep + 1 - prefix;
                 free(prefix);
+                prefix = NULL;
 
                 cs->path_list = malloc(sizeof(char *) * 2);
@@ -252 +253 @@
         }
 
-        if (cs != NULL && cs->prefix != NULL)
+        if ((cs != NULL) && (cs->prefix != NULL))
                 free(cs->prefix);
+        
         if (dirname != NULL)
                 free(dirname);
+        
         if (prefix != NULL)
                 free(prefix);
+        
         if (stext != NULL)
                 free(stext);
+        
         if (cs != NULL)
                 free(cs);
+        
         if (tokens != NULL)
                 free(tokens);