X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b3378a02d0a811be38e530933fb9a57a3012a823..98735bfe852adb9e5421e5c04bb2e0119af443bd:/String.hpp?ds=inline diff --git a/String.hpp b/String.hpp index 82299fc..7256fe5 100644 --- a/String.hpp +++ b/String.hpp @@ -1,20 +1,20 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2010 Jay Freeman (saurik) + * Copyright (C) 2009-2013 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ +/* GNU General Public License, Version 3 {{{ */ /* - * Cycript is free software: you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. + * Cycript is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * - * Cycript is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. + * Cycript is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with Cycript. If not, see . **/ /* }}} */ @@ -31,6 +31,12 @@ struct CYUTF8String { const char *data; size_t size; + CYUTF8String() : + data(NULL), + size(0) + { + } + CYUTF8String(const char *data) : data(data), size(strlen(data)) @@ -69,7 +75,7 @@ size_t CYGetIndex(const CYUTF8String &value); bool CYIsKey(CYUTF8String value); bool CYGetOffset(const char *value, ssize_t &index); -CYUTF8String CYPoolUTF8String(apr_pool_t *pool, CYUTF16String utf16); -CYUTF16String CYPoolUTF16String(apr_pool_t *pool, CYUTF8String utf8); +CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16); +CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8); #endif/*CYCRIPT_STRING_HPP*/