Changeset 34120f10 in mainline for uspace/lib/c/generic

Timestamp:

2023-10-27T19:38:31Z (2 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

63ed840

Parents:

c89ae25 (diff), 694ca3d6 (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 code deduplication work

TL;DR: Added directory /common, which now contains the sole existing
copy of ADT, printf_core, and a few other pieces. Should make changes
to any of those less of a headache.

Location:

uspace/lib/c/generic

Files:

• adt/odict.c (deleted)
• io/asprintf.c (modified) (1 diff)
• io/kio.c (modified) (1 diff)
• io/printf.c (modified) (1 diff)
• io/vprintf.c (modified) (1 diff)
• io/vsnprintf.c (modified) (1 diff)
• malloc.c (modified) (3 diffs)
• str_error.c (deleted)

uspace/lib/c/generic/io/asprintf.c

@@ -39 +39 @@
 #include <stddef.h>
 #include <str.h>
-#include <io/printf_core.h>
+#include <printf_core.h>
 
 static int asprintf_str_write(const char *str, size_t count, void *unused)

uspace/lib/c/generic/io/kio.c

@@ -42 +42 @@
 #include <abi/kio.h>
 #include <io/kio.h>
-#include <io/printf_core.h>
+#include <printf_core.h>
 #include <macros.h>
 #include <libarch/config.h>

uspace/lib/c/generic/io/printf.c

@@ -33 +33 @@
  */
 
-#include <io/printf_core.h>
+#include <printf_core.h>
 #include <stdio.h>
 

uspace/lib/c/generic/io/vprintf.c

@@ -35 +35 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include <io/printf_core.h>
+#include <printf_core.h>
 #include <fibril_synch.h>
 #include <async.h>

uspace/lib/c/generic/io/vsnprintf.c

@@ -36 +36 @@
 #include <stdio.h>
 #include <str.h>
-#include <io/printf_core.h>
+#include <printf_core.h>
 #include <errno.h>
 

uspace/lib/c/generic/malloc.c

@@ -34 +34 @@
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdalign.h>
 #include <stdbool.h>
@@ -47 +47 @@
 #include <stdlib.h>
 #include <adt/gcdlcm.h>
+#include <malloc.h>
 
 #include "private/malloc.h"
@@ -773 +774 @@
 }
 
-/** Allocate memory by number of elements
- *
- * @param nmemb Number of members to allocate.
- * @param size  Size of one member in bytes.
- *
- * @return Allocated memory or NULL.
- *
- */
-void *calloc(const size_t nmemb, const size_t size)
-{
-        // FIXME: Check for overflow
-
-        void *block = malloc(nmemb * size);
-        if (block == NULL)
-                return NULL;
-
-        memset(block, 0, nmemb * size);
-        return block;
-}
-
 /** Allocate memory
  *