Changes in / [6b00876:d9ffc54] in mainline

Files:

• kernel/generic/src/console/kconsole.c (modified) (2 diffs)
• uspace/lib/drv/generic/driver.c (modified) (3 diffs)

kernel/generic/src/console/kconsole.c

@@ -368 +368 @@
                          */
                         size_t beg;
-                        unsigned sp = 0, narg = 0;
+                        unsigned narg = 0;
                         if (position == 0) {
                                 tmp[0] = '\0';
                                 beg = 0;
-                        }
-                        else {
-                                for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
-                                    beg--);
+                        } else {
+                                for (beg = position - 1;
+                                    (beg > 0) && (!isspace(current[beg]));
+                                    beg--) {
+                                        ;
+                                }
                                 
                                 if (isspace(current[beg]))
@@ -384 +386 @@
                         
                         /* Count which argument number are we tabbing (narg=0 is cmd) */
+                        bool sp = false;
                         for (; beg > 0; beg--) {
                                 if (isspace(current[beg])) {
                                         if (!sp) {
                                                 narg++;
-                                                sp = 1;
+                                                sp = true;
                                         }
-                                }
-                                else
-                                        sp = 0;
+                                } else
+                                        sp = false;
                         }
                         if (narg && isspace(current[0]))

uspace/lib/drv/generic/driver.c

@@ -121 +121 @@
         devman_handle_t parent_fun_handle = IPC_GET_ARG2(*icall);
         
-        ddf_dev_t *dev = create_device();
-        
-        /* Add one reference that will be dropped by driver_dev_remove() */
-        dev_add_ref(dev);
-        dev->handle = dev_handle;
-        
         char *dev_name = NULL;
         int rc = async_data_write_accept((void **) &dev_name, true, 0, 0, 0, 0);
@@ -133 +127 @@
                 return;
         }
-        
+
+        ddf_dev_t *dev = create_device();
+        if (!dev) {
+                free(dev_name);
+                async_answer_0(iid, ENOMEM);
+                return;
+        }
+
+        /* Add one reference that will be dropped by driver_dev_remove() */
+        dev_add_ref(dev);
+        dev->handle = dev_handle;
         dev->name = dev_name;
         
@@ -495 +499 @@
         if (dev->driver_data != NULL)
                 free(dev->driver_data);
+        if (dev->name)
+                free(dev->name);
         free(dev);
 }