Implemented the <string.h> strpbrk() function.

dryc · Nov 23, 2014 · 7288ca5 · 7288ca5
1 parent 4ed9af8
commit 7288ca5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/string/strpbrk.c b/src/string/strpbrk.c
@@ -4,7 +4,7 @@
 #include <config.h>
 #endif
 
-#include <string.h> /* for NULL, strpbrk() */
+#include <string.h> /* for NULL, strchr(), strpbrk() */
 
 /**
  * @date   2014-11-23
@@ -13,7 +13,11 @@
  */
 char*
 strpbrk(const char* s1,
-        const char* s2) {
+        const char* const s2) {
 
-  return (void)s1, (void)s2, NULL; // TODO
+  while (*s1 != '\0' && strchr(s2, *s1) == NULL) {
+    s1++;
+  }
+
+  return (*s1 != '\0') ? (char*)s1 : NULL;
 }
diff --git a/src/string/strspn.c b/src/string/strspn.c
@@ -13,11 +13,11 @@
  */
 size_t
 strspn(const char* s1,
-       const char* s2) {
+       const char* const s2) {
 
   size_t result = 0;
 
-  while (*s1 && strchr(s2, *s1)) {
+  while (*s1 != '\0' && strchr(s2, *s1) != NULL) {
     s1++, result++;
   }