diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-21 11:01:19 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-21 18:02:32 +0000 |
| commit | a1112249fa5c050646c3093509e8883dca622215 (patch) | |
| tree | fa707cc380a57f884f90550fa595d0c6de306c80 /cfutils.c | |
| parent | 43443af0acc93e47a145688171049af65eed762f (diff) | |
Move get_os_version_info() to libwsutil.
This mean we also have to move CFString_to_C_string() there for OS X.
Change-Id: Ic91ad872e9d5290cf34f842503ededd5452e4337
Reviewed-on: https://code.wireshark.org/review/2511
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'cfutils.c')
| -rw-r--r-- | cfutils.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/cfutils.c b/cfutils.c deleted file mode 100644 index 7b8e683cb3..0000000000 --- a/cfutils.c +++ /dev/null @@ -1,54 +0,0 @@ -/* cfutils.c - * Routines to work around deficiencies in Core Foundation, such as the - * lack of a routine to convert a CFString to a C string of arbitrary - * size. - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 2001 Gerald Combs - * - * This program 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 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#ifdef HAVE_OS_X_FRAMEWORKS -#include <glib.h> -#include <CoreFoundation/CoreFoundation.h> -#include "cfutils.h" - -/* - * Convert a CFString to a UTF-8-encoded C string; the resulting string - * is allocated with g_malloc(). Returns NULL if the conversion fails. - */ -char * -CFString_to_C_string(CFStringRef cfstring) -{ - CFIndex string_len; - char *string; - - string_len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstring), - kCFStringEncodingUTF8); - string = (char *)g_malloc(string_len + 1); - if (!CFStringGetCString(cfstring, string, string_len + 1, - kCFStringEncodingUTF8)) { - g_free(string); - return NULL; - } - return string; -} -#endif - - |