Changeset 36df27eb in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2018-01-13T03:18:18Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

a53ed3a (diff), 08d4ea2 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-13 03:18:18)

git-committer:

GitHub <noreply@…> (2018-01-13 03:18:18)

Message:

Merge 08d4ea2111e5db01d0a6194bd9da4248ee282dc7 into a53ed3a8097360ccf174e8d94fb407db919eb66a

File:

• uspace/srv/hid/compositor/compositor.c (modified) (2 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -2254 +2254 @@
         if (rc != EOK) {
                 printf("%s: Unable to register server (%s)\n", NAME, str_error(rc));
-                return -1;
+                return rc;
         }
         
@@ -2272 +2272 @@
         char winreg[LOC_NAME_MAXLEN + 1];
         snprintf(winreg, LOC_NAME_MAXLEN, "%s%s/winreg", NAMESPACE, server_name);
-        if (loc_service_register(winreg, &winreg_id) != EOK) {
+        rc = loc_service_register(winreg, &winreg_id);
+        if (rc != EOK) {
                 printf("%s: Unable to register service %s\n", NAME, winreg);
-                return -1;
+                return rc;
         }