Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/posix/include/posix/string.h

    rfdf97f6 r32b3a12  
    3737#define POSIX_STRING_H_
    3838
    39 #ifndef __POSIX_DEF__
    40 #define __POSIX_DEF__(x) x
    41 #endif
    42 
    4339#include "sys/types.h"
    4440
    … …  
    6965
    7066/* From mem.h */
    71 // #define bzero(ptr, len)  memset((ptr), 0, (len))
     67#define bzero(ptr, len)  memset((ptr), 0, (len))
    7268extern void *memset(void *, int, size_t);
    7369extern void *memcpy(void *, const void *, size_t);
    … …  
    7672
    7773/* Copying and Concatenation */
    78 extern char *__POSIX_DEF__(strcpy)(char *restrict dest, const char *restrict src);
    79 extern char *__POSIX_DEF__(strncpy)(char *restrict dest, const char *restrict src, size_t n);
    80 extern char *__POSIX_DEF__(stpcpy)(char *restrict dest, const char *restrict src);
    81 extern char *__POSIX_DEF__(stpncpy)(char *restrict dest, const char *restrict src, size_t n);
    82 extern char *__POSIX_DEF__(strcat)(char *restrict dest, const char *restrict src);
    83 extern char *__POSIX_DEF__(strncat)(char *restrict dest, const char *restrict src, size_t n);
    84 extern void *__POSIX_DEF__(memccpy)(void *restrict dest, const void *restrict src, int c, size_t n);
    85 extern char *__POSIX_DEF__(strdup)(const char *s);
    86 extern char *__POSIX_DEF__(strndup)(const char *s, size_t n);
     74extern char *posix_strcpy(char *restrict dest, const char *restrict src);
     75extern char *posix_strncpy(char *restrict dest, const char *restrict src, size_t n);
     76extern char *posix_stpcpy(char *restrict dest, const char *restrict src);
     77extern char *posix_stpncpy(char *restrict dest, const char *restrict src, size_t n);
     78extern char *posix_strcat(char *restrict dest, const char *restrict src);
     79extern char *posix_strncat(char *restrict dest, const char *restrict src, size_t n);
     80extern void *posix_memccpy(void *restrict dest, const void *restrict src, int c, size_t n);
     81extern char *posix_strdup(const char *s);
     82extern char *posix_strndup(const char *s, size_t n);
    8783
    8884/* String/Array Comparison */
    89 extern int __POSIX_DEF__(memcmp)(const void *mem1, const void *mem2, size_t n);
    90 extern int __POSIX_DEF__(strcmp)(const char *s1, const char *s2);
    91 extern int __POSIX_DEF__(strncmp)(const char *s1, const char *s2, size_t n);
     85extern int posix_memcmp(const void *mem1, const void *mem2, size_t n);
     86extern int posix_strcmp(const char *s1, const char *s2);
     87extern int posix_strncmp(const char *s1, const char *s2, size_t n);
    9288
    9389/* Search Functions */
    94 extern void *__POSIX_DEF__(memchr)(const void *mem, int c, size_t n);
    95 extern char *__POSIX_DEF__(strchr)(const char *s, int c);
    96 extern char *__POSIX_DEF__(strrchr)(const char *s, int c);
     90extern void *posix_memchr(const void *mem, int c, size_t n);
     91extern char *posix_strchr(const char *s, int c);
     92extern char *posix_strrchr(const char *s, int c);
    9793extern char *gnu_strchrnul(const char *s, int c);
    98 extern char *__POSIX_DEF__(strpbrk)(const char *s1, const char *s2);
    99 extern size_t __POSIX_DEF__(strcspn)(const char *s1, const char *s2);
    100 extern size_t __POSIX_DEF__(strspn)(const char *s1, const char *s2);
    101 extern char *__POSIX_DEF__(strstr)(const char *haystack, const char *needle);
     94extern char *posix_strpbrk(const char *s1, const char *s2);
     95extern size_t posix_strcspn(const char *s1, const char *s2);
     96extern size_t posix_strspn(const char *s1, const char *s2);
     97extern char *posix_strstr(const char *haystack, const char *needle);
    10298
    10399/* Collation Functions */
    104 extern int __POSIX_DEF__(strcoll)(const char *s1, const char *s2);
    105 extern size_t __POSIX_DEF__(strxfrm)(char *restrict s1, const char *restrict s2, size_t n);
     100extern int posix_strcoll(const char *s1, const char *s2);
     101extern size_t posix_strxfrm(char *restrict s1, const char *restrict s2, size_t n);
    106102
    107103/* Error Messages */
    108 extern char *__POSIX_DEF__(strerror)(int errnum);
    109 extern int __POSIX_DEF__(strerror_r)(int errnum, char *buf, size_t bufsz);
     104extern char *posix_strerror(int errnum);
     105extern int posix_strerror_r(int errnum, char *buf, size_t bufsz);
    110106
    111107/* String Length */
    112 extern size_t __POSIX_DEF__(strlen)(const char *s);
    113 extern size_t __POSIX_DEF__(strnlen)(const char *s, size_t n);
     108extern size_t posix_strlen(const char *s);
     109extern size_t posix_strnlen(const char *s, size_t n);
    114110
    115111/* Signal Messages */
    116 extern char *__POSIX_DEF__(strsignal)(int signum);
     112extern char *posix_strsignal(int signum);
    117113
    118114/* Legacy Declarations */
    119115#ifndef POSIX_STRINGS_H_
    120 extern int __POSIX_DEF__(ffs)(int i);
    121 extern int __POSIX_DEF__(strcasecmp)(const char *s1, const char *s2);
    122 extern int __POSIX_DEF__(strncasecmp)(const char *s1, const char *s2, size_t n);
     116extern int posix_ffs(int i);
     117extern int posix_strcasecmp(const char *s1, const char *s2);
     118extern int posix_strncasecmp(const char *s1, const char *s2, size_t n);
    123119#endif
    124120
     121#ifndef LIBPOSIX_INTERNAL
     122        #define strcpy posix_strcpy
     123        #define strncpy posix_strncpy
     124        #define stpcpy posix_stpcpy
     125        #define stpncpy posix_stpncpy
     126        #define strcat posix_strcat
     127        #define strncat posix_strncat
     128        #define memccpy posix_memccpy
     129        #define strdup posix_strdup
     130        #define strndup posix_strndup
     131
     132        #define memcmp posix_memcmp
     133        #define strcmp posix_strcmp
     134        #define strncmp posix_strncmp
     135
     136        #define memchr posix_memchr
     137        #define strchr posix_strchr
     138        #define strrchr posix_strrchr
     139        #define strchrnul gnu_strchrnul
     140        #define strpbrk posix_strpbrk
     141        #define strcspn posix_strcspn
     142        #define strspn posix_strspn
     143        #define strstr posix_strstr
     144
     145        #define strcoll posix_strcoll
     146        #define strxfrm posix_strxfrm
     147
     148        #define strerror posix_strerror
     149        #define strerror_r posix_strerror_r
     150
     151        #define strlen posix_strlen
     152        #define strnlen posix_strnlen
     153
     154        #define strsignal posix_strsignal
     155
     156        #define ffs posix_ffs
     157        #define strcasecmp posix_strcasecmp
     158        #define strncasecmp posix_strncasecmp
     159#endif
    125160
    126161#endif  // POSIX_STRING_H_
Note: See TracChangeset for help on using the changeset viewer.