Author: rfm
Date: Wed Apr 26 15:49:24 2017
New Revision: 40493
URL: http://svn.gna.org/viewcvs/gnustep?rev=40493&view=rev
Log:
Now that we use standard conforming strings, we can use use the superclass
string quoting code.
Modified:
libs/sqlclient/trunk/Postgres.m
Modified: libs/sqlclient/trunk/Postgres.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/Postgres.m?rev=40493&r1=40492&r2=40493&view=diff
==============================================================================
--- libs/sqlclient/trunk/Postgres.m (original)
+++ libs/sqlclient/trunk/Postgres.m Wed Apr 26 15:49:24 2017
@@ -1650,60 +1650,6 @@
return s;
}
-- (NSString*) quoteString: (NSString *)s
-{
- NSData *d = [s dataUsingEncoding: NSUTF8StringEncoding];
- unsigned l = [d length];
- unsigned char *to = NSZoneMalloc(NSDefaultMallocZone(), (l * 2) + 3);
-
-#if 1
- const char *from = (const char*)[d bytes];
- unsigned i = 0;
- unsigned j = 0;
-
- to[j++] = '\'';
- while (i < l)
- {
- if ('\'' == (to[j++] = from[i++]))
- {
- to[j++] = '\'';
- }
- }
- to[j++] = '\'';
- l = j - 2;
-#else
-#ifdef HAVE_PQESCAPESTRINGCONN
- int err;
-
- [lock lock];
- NS_DURING
- {
- [self connect];
- l = PQescapeStringConn(connection,
- (char*)(to + 1), [d bytes], l, &err);
- }
- NS_HANDLER
- {
- [lock unlock];
- NSZoneFree(NSDefaultMallocZone(), to);
- [localException raise];
- }
- NS_ENDHANDLER
- [lock unlock];
-#else
- l = PQescapeString(to + 1, [d bytes], l);
-#endif
- to[0] = '\'';
- to[l + 1] = '\'';
-#endif
-
- s = [[NSString alloc] initWithBytesNoCopy: to
- length: l + 2
- encoding: NSUTF8StringEncoding
- freeWhenDone: YES];
- return [s autorelease];
-}
-
@end
#if defined(GNUSTEP_BASE_LIBRARY) && !defined(__MINGW__)
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
