From 2206412e14cc28373a855c6c71a528b36ff0b524 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Sat, 22 Sep 2012 23:00:54 +0200
Subject: [PATCH] Replace Maxsi::String::Reject with strcspn.

---
 games/asteroids.cpp          | 4 ++--
 libmaxsi/readparamstring.cpp | 4 ++--
 sortix/fs/util.cpp           | 2 +-
 sortix/video.cpp             | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/games/asteroids.cpp b/games/asteroids.cpp
index ef94173a..a5e7a5e8 100644
--- a/games/asteroids.cpp
+++ b/games/asteroids.cpp
@@ -1088,9 +1088,9 @@ extern "C" bool ReadParamString(const char* str, ...)
 	va_list args;
 	while ( *str )
 	{
-		size_t varlen = String::Reject(str, ",");
+		size_t varlen = strcspn(str, ",");
 		if ( !varlen ) { str++; continue; }
-		size_t namelen = String::Reject(str, "=");
+		size_t namelen = strcspn(str, "=");
 		if ( !namelen ) { errno = EINVAL; goto cleanup; }
 		if ( !str[namelen] ) { errno = EINVAL; goto cleanup; }
 		if ( varlen < namelen ) { errno = EINVAL; goto cleanup; }
diff --git a/libmaxsi/readparamstring.cpp b/libmaxsi/readparamstring.cpp
index 60736631..32af6017 100644
--- a/libmaxsi/readparamstring.cpp
+++ b/libmaxsi/readparamstring.cpp
@@ -37,9 +37,9 @@ extern "C" bool ReadParamString(const char* str, ...)
 	va_list args;
 	while ( *str )
 	{
-		size_t varlen = String::Reject(str, ",");
+		size_t varlen = strcspn(str, ",");
 		if ( !varlen ) { str++; continue; }
-		size_t namelen = String::Reject(str, "=");
+		size_t namelen = strcspn(str, "=");
 		if ( !namelen ) { errno = EINVAL; goto cleanup; }
 		if ( !str[namelen] ) { errno = EINVAL; goto cleanup; }
 		if ( varlen < namelen ) { errno = EINVAL; goto cleanup; }
diff --git a/sortix/fs/util.cpp b/sortix/fs/util.cpp
index b1bd707d..129f512e 100644
--- a/sortix/fs/util.cpp
+++ b/sortix/fs/util.cpp
@@ -124,7 +124,7 @@ ssize_t DevLineCommand::Write(const uint8_t* src, size_t count)
 	if ( available < count ) { count = available; }
 	memcpy(cmd + sofar, src, count);
 	cmd[sofar += count] = 0;
-	size_t newlinepos = String::Reject(cmd, "\n");
+	size_t newlinepos = strcspn(cmd, "\n");
 	if ( !cmd[newlinepos] ) { return count; }
 	cmd[newlinepos] = 0;
 	if ( !handler(user, cmd) ) { return -1; }
diff --git a/sortix/video.cpp b/sortix/video.cpp
index 2d79fa9a..e40bc6bd 100644
--- a/sortix/video.cpp
+++ b/sortix/video.cpp
@@ -42,9 +42,9 @@ bool ReadParamString(const char* str, ...)
 	va_list args;
 	while ( *str )
 	{
-		size_t varlen = String::Reject(str, ",");
+		size_t varlen = strcspn(str, ",");
 		if ( !varlen ) { str++; continue; }
-		size_t namelen = String::Reject(str, "=");
+		size_t namelen = strcspn(str, "=");
 		if ( !namelen ) { errno = EINVAL; goto cleanup; }
 		if ( !str[namelen] ) { errno = EINVAL; goto cleanup; }
 		if ( varlen < namelen ) { errno = EINVAL; goto cleanup; }