Changeset 925a21e in mainline for uspace/lib/posix/strings.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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.

File:

• uspace/lib/posix/strings.h (moved) (moved from uspace/lib/c/include/devmap.h ) (2 diffs)

uspace/lib/posix/strings.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Zarevucky
+ * Copyright (c) 2011 Petr Koupy
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libposix
  * @{
  */
-/** @file
+/** @file Additional string manipulation.
  */
 
-#ifndef LIBC_DEVMAP_H_
-#define LIBC_DEVMAP_H_
+#ifndef POSIX_STRINGS_H_
+#define POSIX_STRINGS_H_
 
-#include <ipc/devmap.h>
-#include <async.h>
-#include <bool.h>
+/* Search Functions */
+#ifndef POSIX_STRING_H_
+extern int posix_ffs(int i);
+#endif
 
-extern async_exch_t *devmap_exchange_begin_blocking(devmap_interface_t);
-extern async_exch_t *devmap_exchange_begin(devmap_interface_t);
-extern void devmap_exchange_end(async_exch_t *);
+/* String/Array Comparison */
+#ifndef POSIX_STRING_H_
+extern int posix_strcasecmp(const char *s1, const char *s2);
+extern int posix_strncasecmp(const char *s1, const char *s2, size_t n);
+#endif
 
-extern int devmap_driver_register(const char *, async_client_conn_t);
-extern int devmap_device_register(const char *, devmap_handle_t *);
-extern int devmap_device_register_with_iface(const char *, devmap_handle_t *,
-    sysarg_t);
+/* TODO: not implemented due to missing locale support
+ *
+ * int strcasecmp_l(const char *, const char *, locale_t);
+ * int strncasecmp_l(const char *, const char *, size_t, locale_t);
+ */
 
-extern int devmap_device_get_handle(const char *, devmap_handle_t *,
-    unsigned int);
-extern int devmap_namespace_get_handle(const char *, devmap_handle_t *,
-    unsigned int);
-extern devmap_handle_type_t devmap_handle_probe(devmap_handle_t);
+/* Legacy Functions */
+extern int posix_bcmp(const void *mem1, const void *mem2, size_t n);
+extern void posix_bcopy(const void *src, void *dest, size_t n);
+extern void posix_bzero(void *mem, size_t n);
+extern char *posix_index(const char *s, int c);
+extern char *posix_rindex(const char *s, int c);
 
-extern async_sess_t *devmap_device_connect(exch_mgmt_t, devmap_handle_t,
-    unsigned int);
+#ifndef LIBPOSIX_INTERNAL
+        #define ffs posix_ffs
 
-extern int devmap_null_create(void);
-extern void devmap_null_destroy(int);
+        #define strcasecmp posix_strcasecmp
+        #define strncasecmp posix_strncasecmp
 
-extern size_t devmap_count_namespaces(void);
-extern size_t devmap_count_devices(devmap_handle_t);
+        #define bcmp posix_bcmp
+        #define bcopy posix_bcopy
+        #undef bzero
+        #define bzero posix_bzero
+        #define index posix_index
+        #define rindex posix_rindex
+#endif
 
-extern size_t devmap_get_namespaces(dev_desc_t **);
-extern size_t devmap_get_devices(devmap_handle_t, dev_desc_t **);
-
-#endif
+#endif  // POSIX_STRINGS_H_
 
 /** @}