Changeset bdca26a in mainline for uspace/lib/c/generic/rtld/module.c

Timestamp:

2019-05-26T13:21:50Z (5 years ago)

Author:

Jakub Jermář <jakub@…>

Branches:

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

Children:

8aea932

Parents:

967e7a1

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-05-17 14:27:34)

git-committer:

Jakub Jermář <jakub@…> (2019-05-26 13:21:50)

Message:

Removing printf when failing from lib/rtld

If rtld failed a message was printed with printf.
This has been replaced with DPRINTF which
gives control to the developer over the message

File:

• uspace/lib/c/generic/rtld/module.c (modified) (6 diffs)

uspace/lib/c/generic/rtld/module.c

@@ -65 +65 @@
 
         module = calloc(1, sizeof(module_t));
-        if (module == NULL)
+        if (module == NULL) {
+                DPRINTF("malloc failed\n");
                 return ENOMEM;
+        }
 
         module->id = rtld_get_next_id(rtld);
@@ -182 +184 @@
         char name_buf[NAME_BUF_SIZE];
         module_t *m;
-        int rc;
+        errno_t rc;
 
         m = calloc(1, sizeof(module_t));
         if (m == NULL) {
-                printf("malloc failed\n");
+                DPRINTF("malloc failed\n");
                 goto error;
         }
@@ -197 +199 @@
 
         if (str_size(name) > NAME_BUF_SIZE - 2) {
-                printf("soname too long. increase NAME_BUF_SIZE\n");
+                DPRINTF("soname too long. increase NAME_BUF_SIZE\n");
                 goto error;
         }
@@ -208 +210 @@
 
         rc = elf_load_file_name(name_buf, RTLD_MODULE_LDF, &info);
-        if (rc != EE_OK) {
-                printf("Failed to load '%s'\n", name_buf);
+        if (rc != EOK) {
+                DPRINTF("Failed to load '%s'\n", name_buf);
                 goto error;
         }
@@ -218 +220 @@
 
         if (info.dynamic == NULL) {
-                printf("Error: '%s' is not a dynamically-linked object.\n",
+                DPRINTF("Error: '%s' is not a dynamically-linked object.\n",
                     name_buf);
                 goto error;
@@ -285 +287 @@
         m->deps = malloc(n * sizeof(module_t *));
         if (!m->deps) {
-                printf("malloc failed\n");
+                DPRINTF("malloc failed\n");
                 return ENOMEM;
         }