Changeset c8dc9ac in mainline

Timestamp:

2016-10-11T08:20:59Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

48eb2fc2

Parents:

6eda732 (diff), 523b17a (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 from lp:~werkov/helenos/various-fixes

Location:

uspace

Files:

• Makefile.common (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/str.c (modified) (5 diffs)
• lib/c/test/main.c (modified) (1 diff)
• lib/c/test/str.c (added)
• srv/hid/compositor/compositor.c (modified) (5 diffs)

uspace/Makefile.common

@@ -413 +413 @@
 
 $(DEPEND): $(PRE_DEPEND)
-        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
+        makedepend -f - -o.test.o -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) -- $(TEST_SOURCES) >> $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
 

uspace/lib/c/Makefile

@@ -176 +176 @@
         test/main.c \
         test/odict.c \
-        test/sprintf.c
+        test/sprintf.c \
+        test/str.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/c/generic/str.c

@@ -1157 +1157 @@
                 memmove(str, &str[pos], str_sz - pos);
                 pos = str_sz - pos;
-                str[str_sz - pos] = '\0';
+                str[pos] = '\0';
         }
 }
@@ -1250 +1250 @@
 }
 
-/** Convert string to a number. 
+/** Convert string to a number.
  * Core of strtol and strtoul functions.
  *
@@ -1296 +1296 @@
                                 str += 2;
                         }
-                } 
+                }
         }
         
@@ -1335 +1335 @@
                 *endptr = (char *) str;
 
-        if (nptr == str) { 
+        if (nptr == str) {
                 /*FIXME: errno = EINVAL*/
                 return 0;
@@ -1366 +1366 @@
                 if ((sgn) && (number == (unsigned long) (LONG_MAX) + 1)) {
                         /* FIXME: set 0 to errno */
-                        return number;          
+                        return number;
                 }
                 /* FIXME: set ERANGE to errno */
-                return (sgn ? LONG_MIN : LONG_MAX);     
+                return (sgn ? LONG_MIN : LONG_MAX);
         }
         

uspace/lib/c/test/main.c

@@ -34 +34 @@
 PCUT_IMPORT(odict);
 PCUT_IMPORT(sprintf);
+PCUT_IMPORT(str);
 
 PCUT_MAIN()

uspace/srv/hid/compositor/compositor.c

@@ -471 +471 @@
                                                 /* FIXME: Ghost is currently drawn based on the bounding
                                                  * rectangle of the window, which is sufficient as long
-                                                 * as the windows can be rotated only by 90 degrees. 
+                                                 * as the windows can be rotated only by 90 degrees.
                                                  * For ghost to be compatible with arbitrary-angle
                                                  * rotation, it should be drawn as four lines adjusted
@@ -910 +910 @@
                         if (!win) {
                                 async_answer_2(callid, ENOMEM, 0, 0);
+                                fibril_mutex_unlock(&window_list_mtx);
                                 return;
                         }
@@ -928 +929 @@
                                 window_destroy(win);
                                 async_answer_2(callid, EINVAL, 0, 0);
+                                fibril_mutex_unlock(&window_list_mtx);
                                 return;
                         }
@@ -935 +937 @@
                                 window_destroy(win);
                                 async_answer_2(callid, EINVAL, 0, 0);
+                                fibril_mutex_unlock(&window_list_mtx);
                                 return;
                         }
@@ -1053 +1056 @@
 
         /* Create surface with respect to the retrieved mode. */
-        surface_t *new_surface = surface_create(new_mode.screen_width, 
+        surface_t *new_surface = surface_create(new_mode.screen_width,
             new_mode.screen_height, NULL, SURFACE_FLAG_SHARED);
         if (!new_surface) {