diff options
| author | Michael Brown | 2007-07-08 23:06:33 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-07-08 23:06:33 +0200 |
| commit | cc80750694feec31139640987c326da9fbafd1c1 (patch) | |
| tree | 0c7c611bfcb3630db3b3e0a6a3382d16d80535df /src/include | |
| parent | Ready to start testing (diff) | |
| parent | Add strcspn() and strndup() (diff) | |
| download | ipxe-cc80750694feec31139640987c326da9fbafd1c1.tar.gz ipxe-cc80750694feec31139640987c326da9fbafd1c1.tar.xz ipxe-cc80750694feec31139640987c326da9fbafd1c1.zip | |
Merge branch 'master' into iscsi-update
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/gpxe/refcnt.h | 2 | ||||
| -rw-r--r-- | src/include/string.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/include/gpxe/refcnt.h b/src/include/gpxe/refcnt.h index 0930a5777..68e0fd4b0 100644 --- a/src/include/gpxe/refcnt.h +++ b/src/include/gpxe/refcnt.h @@ -38,7 +38,7 @@ struct refcnt { void ( * free ) ( struct refcnt *refcnt ); }; -extern void ref_get ( struct refcnt *refcnt ); +extern struct refcnt * ref_get ( struct refcnt *refcnt ); extern void ref_put ( struct refcnt *refcnt ); #endif /* _GPXE_REFCNT_H */ diff --git a/src/include/string.h b/src/include/string.h index e02b5edb5..1d104c524 100644 --- a/src/include/string.h +++ b/src/include/string.h @@ -30,6 +30,7 @@ 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 * strtok(char * s,const char * ct); char * strsep(char **s, const char *ct); @@ -41,6 +42,7 @@ 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); extern const char * strerror ( int errno ); |