From 8e3e97fcef46cd3864da144e8295250b8f77a0db Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Thu, 2 Aug 2007 00:51:38 +0200 Subject: set __pure attribute where possible --- src/include/string.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/include/string.h') diff --git a/src/include/string.h b/src/include/string.h index 1d104c524..3274bcba7 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -17,32 +17,32 @@ #include #include -int strnicmp(const char *s1, const char *s2, size_t len); +int __pure strnicmp(const char *s1, const char *s2, size_t len); char * strcpy(char * dest,const char *src); char * strncpy(char * dest,const char *src,size_t count); char * strcat(char * dest, const char * src); char * strncat(char *dest, const char *src, size_t count); -int __attribute__ (( pure )) strcmp(const char * cs,const char * ct); -int __attribute__ (( pure )) strncmp(const char * cs,const char * ct, +int __pure strcmp(const char * cs,const char * ct); +int __pure strncmp(const char * cs,const char * ct, size_t count); -char * strchr(const char * s, int c); -char * strrchr(const char * s, int c); -size_t strlen(const char * s); -size_t strnlen(const char * s, size_t count); -size_t strspn(const char *s, const char *accept); -size_t strcspn(const char *s, const char *reject); -char * strpbrk(const char * cs,const char * ct); +char * __pure strchr(const char * s, int c); +char * __pure strrchr(const char * s, int c); +size_t __pure strlen(const char * s); +size_t __pure strnlen(const char * s, size_t count); +size_t __pure strspn(const char *s, const char *accept); +size_t __pure strcspn(const char *s, const char *reject); +char * __pure strpbrk(const char * cs,const char * ct); char * strtok(char * s,const char * ct); char * strsep(char **s, const char *ct); void * memset(void * s,int c,size_t count); void * memmove(void * dest,const void *src,size_t count); -int __attribute__ (( pure )) memcmp(const void * cs,const void * ct, +int __pure memcmp(const void * cs,const void * ct, size_t count); -void * memscan(void * addr, int c, size_t size); -char * strstr(const char * s1,const char * s2); -void * memchr(const void *s, int c, size_t n); -char * strdup(const char *s); -char * strndup(const char *s, size_t n); +void * __pure memscan(const void * addr, int c, size_t size); +char * __pure strstr(const char * s1,const char * s2); +void * __pure memchr(const void *s, int c, size_t n); +char * __pure strdup(const char *s); +char * __pure strndup(const char *s, size_t n); extern const char * strerror ( int errno ); -- cgit v1.2.3-55-g7522 From 7e8e4f8abdc05a1fdba60edfd50a11a2f3065efd Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Thu, 2 Aug 2007 01:02:06 +0200 Subject: declare pointers passed to string functions as nonnull --- src/include/string.h | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/include/string.h') diff --git a/src/include/string.h b/src/include/string.h index 3274bcba7..201ae75c4 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -17,32 +17,32 @@ #include #include -int __pure strnicmp(const char *s1, const char *s2, size_t len); -char * strcpy(char * dest,const char *src); -char * strncpy(char * dest,const char *src,size_t count); -char * strcat(char * dest, const char * src); -char * strncat(char *dest, const char *src, size_t count); -int __pure strcmp(const char * cs,const char * ct); +int __pure strnicmp(const char *s1, const char *s2, size_t len) __nonnull; +char * strcpy(char * dest,const char *src) __nonnull; +char * strncpy(char * dest,const char *src,size_t count) __nonnull; +char * strcat(char * dest, const char * src) __nonnull; +char * strncat(char *dest, const char *src, size_t count) __nonnull; +int __pure strcmp(const char * cs,const char * ct) __nonnull; int __pure strncmp(const char * cs,const char * ct, - size_t count); -char * __pure strchr(const char * s, int c); -char * __pure strrchr(const char * s, int c); -size_t __pure strlen(const char * s); -size_t __pure strnlen(const char * s, size_t count); -size_t __pure strspn(const char *s, const char *accept); -size_t __pure strcspn(const char *s, const char *reject); -char * __pure strpbrk(const char * cs,const char * ct); -char * strtok(char * s,const char * ct); -char * strsep(char **s, const char *ct); -void * memset(void * s,int c,size_t count); -void * memmove(void * dest,const void *src,size_t count); + size_t count) __nonnull; +char * __pure strchr(const char * s, int c) __nonnull; +char * __pure strrchr(const char * s, int c) __nonnull; +size_t __pure strlen(const char * s) __nonnull; +size_t __pure strnlen(const char * s, size_t count) __nonnull; +size_t __pure strspn(const char *s, const char *accept) __nonnull; +size_t __pure strcspn(const char *s, const char *reject) __nonnull; +char * __pure strpbrk(const char * cs,const char * ct) __nonnull; +char * strtok(char * s,const char * ct) __nonnull; +char * strsep(char **s, const char *ct) __nonnull; +void * memset(void * s,int c,size_t count) __nonnull; +void * memmove(void * dest,const void *src,size_t count) __nonnull; int __pure memcmp(const void * cs,const void * ct, - size_t count); -void * __pure memscan(const void * addr, int c, size_t size); -char * __pure strstr(const char * s1,const char * s2); -void * __pure memchr(const void *s, int c, size_t n); -char * __pure strdup(const char *s); -char * __pure strndup(const char *s, size_t n); + size_t count) __nonnull; +void * __pure memscan(const void * addr, int c, size_t size) __nonnull; +char * __pure strstr(const char * s1,const char * s2) __nonnull; +void * __pure memchr(const void *s, int c, size_t n) __nonnull; +char * __pure strdup(const char *s) __nonnull; +char * __pure strndup(const char *s, size_t n) __nonnull; extern const char * strerror ( int errno ); -- cgit v1.2.3-55-g7522 From 7e1db201b92a955120f565018b1b144aae50d8b4 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Thu, 2 Aug 2007 03:04:44 +0200 Subject: strdup and strndup call malloc and are not pure --- src/include/string.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/include/string.h') diff --git a/src/include/string.h b/src/include/string.h index 201ae75c4..210c3753a 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -41,8 +41,8 @@ int __pure memcmp(const void * cs,const void * ct, void * __pure memscan(const void * addr, int c, size_t size) __nonnull; char * __pure strstr(const char * s1,const char * s2) __nonnull; void * __pure memchr(const void *s, int c, size_t n) __nonnull; -char * __pure strdup(const char *s) __nonnull; -char * __pure strndup(const char *s, size_t n) __nonnull; +char * strdup(const char *s) __nonnull; +char * strndup(const char *s, size_t n) __nonnull; extern const char * strerror ( int errno ); -- cgit v1.2.3-55-g7522 From 8bb295e3fd54a59b554ff5e2ff2d510ebf32f5f5 Mon Sep 17 00:00:00 2001 From: Holger Lubitz Date: Mon, 20 Aug 2007 20:29:58 +0200 Subject: use malloc attribute --- src/include/string.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/include/string.h') diff --git a/src/include/string.h b/src/include/string.h index 210c3753a..a2894a3a3 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -41,9 +41,9 @@ int __pure memcmp(const void * cs,const void * ct, void * __pure memscan(const void * addr, int c, size_t size) __nonnull; char * __pure strstr(const char * s1,const char * s2) __nonnull; void * __pure memchr(const void *s, int c, size_t n) __nonnull; -char * strdup(const char *s) __nonnull; -char * strndup(const char *s, size_t n) __nonnull; +char * __malloc strdup(const char *s) __nonnull; +char * __malloc strndup(const char *s, size_t n) __nonnull; -extern const char * strerror ( int errno ); +extern const char * __pure strerror ( int errno ); #endif /* ETHERBOOT_STRING */ -- cgit v1.2.3-55-g7522