Overview
Comment: | Add OFXMLFactory. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
8e7f91646dd608e02a4e4fb57e739f87 |
User & Date: | js on 2008-10-25 23:41:25 |
Other Links: | manifest | tags |
Context
2008-10-25
| ||
23:46 | Remove -fconstant-string-class. check-in: b405f355be user: js tags: trunk | |
23:41 | Add OFXMLFactory. check-in: 8e7f91646d user: js tags: trunk | |
22:34 | initWithFooString -> initAsFooString. check-in: 326b0a1c33 user: js tags: trunk | |
Changes
Modified src/Makefile from [c014f45fb9] to [95c2cb6098].
1 2 3 4 5 6 7 8 9 10 11 12 13 | LIB = ${LIB_PREFIX}objfw${LIB_SUFFIX} LIB_MAJOR = 1 LIB_MINOR = 0 SRCS = OFConstCString.m \ OFCString.m \ OFConstWideCString.m \ OFExceptions.m \ OFFile.m \ OFList.m \ OFListObject.m \ OFObject.m \ OFString.m \ | | > | < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | LIB = ${LIB_PREFIX}objfw${LIB_SUFFIX} LIB_MAJOR = 1 LIB_MINOR = 0 SRCS = OFConstCString.m \ OFCString.m \ OFConstWideCString.m \ OFExceptions.m \ OFFile.m \ OFList.m \ OFListObject.m \ OFObject.m \ OFString.m \ OFWideCString.m \ OFXMLFactory.m INCLUDES = ${SRCS:.m=.h} include ../buildsys.mk CPPFLAGS += -I.. OBJCFLAGS += ${LIB_CFLAGS} LD = ${OBJC} LDFLAGS += ${LIB_LDFLAGS} LIBS += -lobjc |
Added src/OFXMLFactory.h version [eed267924f].
> > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" @interface OFXMLFactory: OFObject + (char*)escapeCString: (const char*)s; + (char*)createStanza: (const char*)name withCloseTag: (BOOL)close andCData: (const char*)cdata, ...; + (char*)concatAndFreeCStrings: (char **)strs; @end |
Added src/OFXMLFactory.m version [e4ef2335c1].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import <stdarg.h> #import <stddef.h> #import <stdlib.h> #import <string.h> #import "OFXMLFactory.h" #import "OFExceptions.h" /* * We don't use OFString in this file for performance reasons! * * We already have a clue about how big the resulting string will get, so we * can prealloc and only resize when really necessary - OFString would always * resize when we append, which would be slow here. */ inline BOOL xmlfactory_resize(char **str, size_t *len, size_t add) { char *str2; size_t len2; len2 = *len + add; if ((str2 = realloc(*str, len2)) == NULL) { if (*str) free(*str); *str = NULL; return NO; } *str = str2; *len = len2; return YES; } inline BOOL xmlfactory_add2str(char **str, size_t *len, size_t *pos, const char *add) { size_t add_len; add_len = strlen(add); if (!xmlfactory_resize(str, len, add_len)) return NO; memcpy(*str + *pos, add, add_len); *pos += add_len; return YES; } @implementation OFXMLFactory + (char*)escapeCString: (const char*)s { char *ret; size_t i, j, len, nlen; len = nlen = strlen(s); if ((ret = malloc(len + 1)) == NULL) { [[OFNoMemException newWithObject: nil andSize: len + 1] raise]; return NULL; } for (i = j = 0; i < len; i++) { switch (s[i]) { case '<': if (!xmlfactory_add2str(&ret, &nlen, &j, "<")) { [[OFNoMemException newWithObject: nil andSize: nlen + 4] raise]; return NULL; } break; case '>': if (!xmlfactory_add2str(&ret, &nlen, &j, ">")) { [[OFNoMemException newWithObject: nil andSize: nlen + 4] raise]; return NULL; } break; case '"': if (!xmlfactory_add2str(&ret, &nlen, &j, """)) { [[OFNoMemException newWithObject: nil andSize: nlen + 6] raise]; return NULL; } break; case '\'': if (!xmlfactory_add2str(&ret, &nlen, &j, "'")) { [[OFNoMemException newWithObject: nil andSize: nlen + 6] raise]; return NULL; } break; case '&': if (!xmlfactory_add2str(&ret, &nlen, &j, "&")) { [[OFNoMemException newWithObject: nil andSize: nlen + 5] raise]; return NULL; } break; default: ret[j++] = s[i]; break; } } ret[j] = 0; return ret; } + (char*)createStanza: (const char*)name withCloseTag: (BOOL)close andCData: (const char*)cdata, ... { char *arg, *val, *xml; size_t i, len; va_list args; /* Start of tag */ len = strlen(name) + 3; if ((xml = malloc(len)) == NULL) { [[OFNoMemException newWithObject: nil andSize: len] raise]; return NULL; } i = 0; xml[i++] = '<'; memcpy(xml + i, name, strlen(name)); i += strlen(name); /* Arguments */ va_start(args, cdata); while ((arg = va_arg(args, char*)) != NULL && (val = va_arg(args, char*)) != NULL) { char *esc_val; if ((esc_val = [OFXMLFactory escapeCString: val]) == NULL) { /* * escapeCString already throws an exception, * no need to throw a second one here. */ free(xml); return NULL; } if (!xmlfactory_resize(&xml, &len, 1 + strlen(arg) + 2 + strlen(esc_val) + 1)) { free(esc_val); [[OFNoMemException newWithObject: nil andSize: len + 1 + strlen(arg) + 2 + strlen(esc_val) + 1] raise]; return NULL; } xml[i++] = ' '; memcpy(xml + i, arg, strlen(arg)); i += strlen(arg); xml[i++] = '='; xml[i++] = '\''; memcpy(xml + i, esc_val, strlen(esc_val)); i += strlen(esc_val); xml[i++] = '\''; free(esc_val); } va_end(args); /* End of tag */ if (close) { if (cdata == NULL) { if (!xmlfactory_resize(&xml, &len, 2 - 1)) { [[OFNoMemException newWithObject: nil andSize: len + 2 - 1] raise]; return NULL; } xml[i++] = '/'; xml[i++] = '>'; } else { if (!xmlfactory_resize(&xml, &len, 1 + strlen(cdata) + 2 + strlen(name) + 1 - 1)) { [[OFNoMemException newWithObject: nil andSize: len + 1 + strlen( cdata) + 2 + strlen(name) + 1 - 1] raise]; return NULL; } xml[i++] = '>'; memcpy(xml + i, cdata, strlen(cdata)); i += strlen(cdata); xml[i++] = '<'; xml[i++] = '/'; memcpy(xml + i, name, strlen(name)); i += strlen(name); xml[i++] = '>'; } } else xml[i++] = '>'; xml[i] = 0; return xml; } + (char*)concatAndFreeCStrings: (char **)strs { char *ret; size_t i, len, pos; if (strs[0] == NULL) return NULL; len = strlen(*strs) + 1; if ((ret = malloc(len)) == NULL) { [[OFNoMemException newWithObject: nil andSize: len] raise]; return NULL; } memcpy(ret, strs[0], len - 1); pos = len - 1; for (i = 1; strs[i] != NULL; i++) { if (!xmlfactory_add2str(&ret, &len, &pos, strs[i])) { free(ret); [[OFNoMemException newWithObject: nil andSize: len + strlen(strs[i])] raise]; return NULL; } } for (i = 0; strs[i] != NULL; i++) free(strs[i]); ret[pos] = 0; return ret; } @end |
Modified tests/Makefile from [5187c45877] to [3eda77d485].
|
| | | 1 2 3 | SUBDIRS = OFObject OFString OFList OFWideString OFXMLFactory include ../buildsys.mk |
Added tests/OFXMLFactory/Makefile version [f31d0f5524].
> > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | PROG_NOINST = ofxmlfactory SRCS = OFXMLFactory.m include ../../buildsys.mk CPPFLAGS += -I../../src LIBS += -lobjc -L../../src -lobjfw .PHONY: run all: run run: ${PROG_NOINST} rm -f libobjfw.so.1 libobjfw.dylib ln -s ../../src/libobjfw.so libobjfw.so.1 ln -s ../../src/libobjfw.dylib libobjfw.dylib LD_LIBRARY_PATH=. \ DYLD_LIBRARY_PATH=. \ ./${PROG_NOINST} rm -f libobjfw.so.1 libobjfw.dylib |
Added tests/OFXMLFactory/OFXMLFactory.m version [545eb3e00b].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | /* * Copyright (c) 2008 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of libobjfw. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import <stdio.h> #import <stdlib.h> #import <string.h> #import <assert.h> #import "OFXMLFactory.h" /* TODO: Do not only print, but check if it's the output it should be */ inline int test_concat() { const char *c1 = "<foo>", *c2 = "bar", *c3 = "<test/>"; char *s1, *s2, *s3, *str; char *strs[4]; if ((s1 = malloc(strlen(c1) + 1)) == NULL || (s2 = malloc(strlen(c2) + 1)) == NULL || (s3 = malloc(strlen(c3) + 1)) == NULL) return 1; strncpy(s1, c1, strlen(c1) + 1); strncpy(s2, c2, strlen(c2) + 1); strncpy(s3, c3, strlen(c3) + 1); strs[0] = s1; strs[1] = s2; strs[2] = s3; strs[3] = NULL; puts((str = [OFXMLFactory concatAndFreeCStrings: strs])); free(str); return 0; } inline int test_create_stanza() { char *xml; xml = [OFXMLFactory createStanza: "foo" withCloseTag: NO andCData: NULL, NULL]; puts(xml); free(xml); xml = [OFXMLFactory createStanza: "foo" withCloseTag: NO andCData: NULL, "bar", "baz", "blub", "asd", NULL]; puts(xml); free(xml); xml = [OFXMLFactory createStanza: "foo" withCloseTag: YES andCData: NULL, NULL]; puts(xml); free(xml); xml = [OFXMLFactory createStanza: "foo" withCloseTag: YES andCData: "bar", NULL]; puts(xml); free(xml); xml = [OFXMLFactory createStanza: "foo" withCloseTag: YES andCData: NULL, "bar", "b&az", NULL]; puts(xml); free(xml); xml = [OFXMLFactory createStanza: "foo" withCloseTag: YES andCData: "bar", "bar", "b'az", NULL]; puts(xml); free(xml); xml = [OFXMLFactory createStanza: "foo" withCloseTag: YES andCData: NULL, "bar", "b&az", "x", "asd\"", NULL]; puts(xml); free(xml); xml = [OFXMLFactory createStanza: "foo" withCloseTag: YES andCData: "bar", "bar", "b'az", "x", "y", "a", "b", NULL]; puts(xml); free(xml); return 0; } inline int test_escape() { char *tmp; tmp = [OFXMLFactory escapeCString: "<hallo> &welt'\"!&"]; puts(tmp); free(tmp); return 0; } int main() { assert(test_escape() == 0); assert(test_create_stanza() == 0); assert(test_concat() == 0); return 0; } |