aboutsummaryrefslogtreecommitdiff
path: root/src/SString.c
diff options
context:
space:
mode:
authorswhite <swhite@1faa4e14-9dd3-4be0-9f0e-ffe519881164>2004-04-16 11:42:08 +0000
committerswhite <swhite@1faa4e14-9dd3-4be0-9f0e-ffe519881164>2004-04-16 11:42:08 +0000
commit2985e4a0702f0e2b67a18be4d214ac8d2ad9be8a (patch)
tree72249479e780120aad98475dbd0f69ef48f86368 /src/SString.c
parent310f5363afe8ed31b6381ff002991d5c7cfa6d96 (diff)
Addresses Cactus bug 907
Added ability to send HTTP Refresh header: HTTP_Send_OK_Refresh_Header Added parameter HTTP::refresh_seconds Made main content window to respond to refresh parameter setting Also Minor improvements to String module Fixed variable decarations after executable code in a block. git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPD/trunk@193 1faa4e14-9dd3-4be0-9f0e-ffe519881164
Diffstat (limited to 'src/SString.c')
-rw-r--r--src/SString.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/SString.c b/src/SString.c
index b0b1477..a72a576 100644
--- a/src/SString.c
+++ b/src/SString.c
@@ -337,14 +337,20 @@ StringEquals( const String * a, const String * b )
int
StringCompare( const String * a, const String * b )
{
- const size_t length = MIN( a->length, b->length );
+ return StringCompareCString( a, b->chars );
+}
- if( length > 0 )
- return strncmp( a->chars, b->chars, length ) <= 0;
- else if( b->chars == 0 )
- return SSTRUE;
+int
+StringCompareCString( const String * a, const char * b )
+{
+ const size_t length = MIN( a->length, strlen( b ) );
- return SSFALSE;
+ if( length > 0 )
+ return strncmp( a->chars, b, length );
+ else if( strlen( b ) == 0 )
+ return 0;
+ else /* b is empty but a isn't */
+ return 1;
}
String *
@@ -432,7 +438,7 @@ StringConcat( String * s, const String * other )
* On unix the default \n works; on the Mac, you might want \r
*/
void
-String_SetLineEndCharacter( String * s, const SSCHAR *end )
+StringSetLineEndCharacter( String * s, const SSCHAR *end )
{
strncpy( s->line_end, end, LINE_END_BUFSIZE );
s->line_end[LINE_END_BUFSIZE - 1] = '\0';