Changeset 36df27eb in mainline for uspace/srv

Timestamp:

2018-01-13T03:18:18Z (8 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

Location:

uspace/srv

Files:

• audio/hound/main.c (modified) (3 diffs)
• bd/file_bd/file_bd.c (modified) (1 diff)
• bd/sata_bd/sata_bd.c (modified) (1 diff)
• fs/cdfs/cdfs.c (modified) (1 diff)
• fs/exfat/exfat.c (modified) (1 diff)
• fs/ext4fs/ext4fs.c (modified) (1 diff)
• fs/fat/fat.c (modified) (1 diff)
• fs/locfs/locfs.c (modified) (1 diff)
• fs/tmpfs/tmpfs.c (modified) (1 diff)
• fs/udf/udf.c (modified) (1 diff)
• hid/compositor/compositor.c (modified) (2 diffs)
• hid/isdv4_tablet/main.c (modified) (1 diff)
• hid/rfb/main.c (modified) (1 diff)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (2 diffs)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (2 diffs)
• ns/ns.c (modified) (1 diff)
• test/chardev-test/main.c (modified) (1 diff)

uspace/srv/audio/hound/main.c

@@ -80 +80 @@
                 log_fatal("Failed to initialize hound structure: %s",
                     str_error(ret));
-                return -ret;
+                return ret;
         }
 
@@ -91 +91 @@
         if (ret != EOK) {
                 log_fatal("Failed to register server: %s", str_error(ret));
-                return -ret;
+                return ret;
         }
 
@@ -99 +99 @@
                     str_error(ret));
                 hound_server_unregister(id);
-                return -ret;
+                return ret;
         }
         log_info("Running with service id %" PRIun, id);

uspace/srv/bd/file_bd/file_bd.c

@@ -47 +47 @@
 #include <stddef.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <str_error.h>

uspace/srv/bd/sata_bd/sata_bd.c

@@ -258 +258 @@
         rc = get_sata_disks();
         if (rc != EOK) {
-                // TODO: log the error
+                printf(NAME ": Cannot find SATA disks: %s.\n", str_error(rc));
                 return rc;
         }

uspace/srv/fs/cdfs/cdfs.c

@@ -43 +43 @@
 #include <str_error.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <libfs.h>
 #include "cdfs.h"

uspace/srv/fs/exfat/exfat.c

@@ -46 +46 @@
 #include <task.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <libfs.h>
 #include "../../vfs/vfs.h"

uspace/srv/fs/ext4fs/ext4fs.c

@@ -40 +40 @@
 #include <ns.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <task.h>
 #include <ipc/services.h>

uspace/srv/fs/fat/fat.c

@@ -46 +46 @@
 #include <task.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <libfs.h>
 #include "../../vfs/vfs.h"

uspace/srv/fs/locfs/locfs.c

@@ -40 +40 @@
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ipc/services.h>
 #include <ns.h>

uspace/srv/fs/tmpfs/tmpfs.c

@@ -48 +48 @@
 #include <str_error.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <task.h>
 #include <libfs.h>

uspace/srv/fs/udf/udf.c

@@ -42 +42 @@
 #include <errno.h>
 #include <str_error.h>
+#include <stdlib.h>
 #include <task.h>
 #include <libfs.h>

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;
         }
         

uspace/srv/hid/isdv4_tablet/main.c

@@ -320 +320 @@
         service_id_t service_id;
         char *service_name;
-        rc = asprintf(&service_name, "mouse/isdv4-%" PRIun, svc_id);
-        if (rc < 0) {
+        if (asprintf(&service_name, "mouse/isdv4-%" PRIun, svc_id) < 0) {
                 printf(NAME ": Unable to create service name\n");
-                return rc;
+                return ENOMEM;
         }
 

uspace/srv/hid/rfb/main.c

@@ -224 +224 @@
 
         char *service_name;
-        rc = asprintf(&service_name, "rfb/%s", rfb_name);
-        if (rc < 0) {
+        if (asprintf(&service_name, "rfb/%s", rfb_name) < 0) {
                 printf(NAME ": Unable to create service name\n");
-                return rc;
+                return ENOMEM;
         }
 

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -95 +95 @@
                 return -1;
 
-        if (s3c24xx_ts_init(ts) != EOK)
+        if (s3c24xx_ts_init(ts) != 0)
                 return -1;
 
@@ -141 +141 @@
         s3c24xx_ts_wait_for_int_mode(ts, updn_down);
 
-        return EOK;
+        return 0;
 }
 

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -92 +92 @@
                 return -1;
 
-        if (s3c24xx_uart_init(uart) != EOK)
+        if (s3c24xx_uart_init(uart) != 0)
                 return -1;
 
@@ -187 +187 @@
         uart->cds.sarg = uart;
 
-        return EOK;
+        return 0;
 }
 

uspace/srv/ns/ns.c

@@ -42 +42 @@
 #include <abi/ipc/interfaces.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <macros.h>

uspace/srv/test/chardev-test/main.c

@@ -35 +35 @@
 #include <mem.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <task.h>