Changeset b8e72fd1 in mainline for uspace/lib/c/include

Timestamp:

2013-05-30T17:13:02Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

98abd40

Parents:

be2bb4f (diff), 94dfb92 (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 mainline changes

Location:

uspace/lib/c/include

Files:

• device/hw_res_parsed.h (modified) (2 diffs)
• inet/addr.h (added)
• inet/dnsr.h (added)
• inet/inet.h (modified) (1 diff)
• inet/inetcfg.h (modified) (1 diff)
• io/verify.h (modified) (1 diff)
• ipc/dnsr.h (added)
• ipc/services.h (modified) (1 diff)
• mem.h (modified) (2 diffs)

uspace/lib/c/include/device/hw_res_parsed.h

@@ -127 +127 @@
         free(list->dma_channels.channels);
         
-        bzero(list, sizeof(hw_res_list_parsed_t));
+        memset(list, 0, sizeof(hw_res_list_parsed_t));
 }
 
@@ -136 +136 @@
 static inline void hw_res_list_parsed_init(hw_res_list_parsed_t *list)
 {
-        bzero(list, sizeof(hw_res_list_parsed_t));
+        memset(list, 0, sizeof(hw_res_list_parsed_t));
 }
 

uspace/lib/c/include/inet/inet.h

@@ -36 +36 @@
 #define LIBC_INET_INET_H_
 
+#include <inet/addr.h>
 #include <sys/types.h>
 
 #define INET_TTL_MAX 255
-
-typedef struct {
-        uint32_t ipv4;
-} inet_addr_t;
 
 typedef struct {

uspace/lib/c/include/inet/inetcfg.h

@@ -38 +38 @@
 #include <inet/inet.h>
 #include <sys/types.h>
-
-/** Network address */
-typedef struct {
-        /** Address */
-        uint32_t ipv4;
-        /** Number of valid bits in @c ipv4 */
-        int bits;
-} inet_naddr_t;
 
 /** Address object info */

uspace/lib/c/include/io/verify.h

@@ -38 +38 @@
 #ifndef NVERIFY_PRINTF
 
+#ifdef __clang__
+#define PRINTF_ATTRIBUTE(start, end) \
+        __attribute__((format(__printf__, start, end)))
+#else
 #define PRINTF_ATTRIBUTE(start, end) \
         __attribute__((format(gnu_printf, start, end)))
+#endif
 
 #else /* NVERIFY_PRINTF */

uspace/lib/c/include/ipc/services.h

@@ -53 +53 @@
 } services_t;
 
+#define SERVICE_NAME_DNSR     "net/dnsr"
 #define SERVICE_NAME_INET     "net/inet"
 #define SERVICE_NAME_INETCFG  "net/inetcfg"

uspace/lib/c/include/mem.h

@@ -38 +38 @@
 #include <sys/types.h>
 
-#define bzero(ptr, len)  memset((ptr), 0, (len))
-
 extern void *memset(void *, int, size_t)
     __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
@@ -45 +43 @@
     __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
 extern void *memmove(void *, const void *, size_t);
-
-extern int bcmp(const void *, const void *, size_t);
+extern int memcmp(const void *, const void *, size_t);
 
 #endif