Reviewed.

[pdclib] / functions / string / strrchr.c

diff --git a/functions/string/strrchr.c b/functions/string/strrchr.c
index 77504433f9182a0066e821e65dd139e7c24df052..6ce1a3231de2f67bc7be3c5994cecfe165ba1244 100644 (file)
--- a/functions/string/strrchr.c
+++ b/functions/string/strrchr.c
@@ -5,27 +5,22 @@
 // This code is Public Domain. Use, modify, and redistribute at will.
 // ----------------------------------------------------------------------------
 
-// ----------------------------------------------------------------------------
-// C++
-
-const char * strrchr( const char * s, int c ) { /* TODO */ };
-char * strrchr( char * s, int c ) { /* TODO */ };
-
-// ----------------------------------------------------------------------------
-// Standard C
+#include <__NULL.h>
 
-char * strrchr( const char * s, int c ) { /* TODO */ };
-
-/* PDPC code - unreviewed
+char * strrchr( const char * src, int c )
 {
-    const char *p;
-    
-    p = s + strlen(s);
-    while (p >= s)
+    const char * p = src;
+    while ( *p != '\0' )
+    {
+        ++p;
+    }
+    while ( p >= src )
     {
-        if (*p == (char)c) return ((char *)p);
-        p--;
+        if ( *p == (char) c )
+        {
+            return (char *) p;
+        }
+        --p;
     }
-    return (NULL);
+    return NULL;
 }
-*/