mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-24 20:30:07 +01:00
9c3d566e95
* Land the new message args API and type system. This patch is huge, but the public API change is not really large. The set of D-BUS types has changed somewhat, and the arg "getters" are more geared toward language bindings; they don't make a copy, etc. There are also some known issues. See these emails for details on this huge patch: http://lists.freedesktop.org/archives/dbus/2004-December/001836.html http://lists.freedesktop.org/archives/dbus/2005-January/001922.html * dbus/dbus-marshal-*: all the new stuff * dbus/dbus-message.c: basically rewritten * dbus/dbus-memory.c (check_guards): with "guards" enabled, init freed blocks to be all non-nul bytes so using freed memory is less likely to work right * dbus/dbus-internals.c (_dbus_test_oom_handling): add DBUS_FAIL_MALLOC=N environment variable, so you can do DBUS_FAIL_MALLOC=0 to skip the out-of-memory checking, or DBUS_FAIL_MALLOC=10 to make it really, really, really slow and thorough. * qt/message.cpp: port to the new message args API (operator<<): use str.utf8() rather than str.unicode() (pretty sure this is right from the Qt docs?) * glib/dbus-gvalue.c: port to the new message args API * bus/dispatch.c, bus/driver.c: port to the new message args API * dbus/dbus-string.c (_dbus_string_init_const_len): initialize the "locked" flag to TRUE and align_offset to 0; I guess we never looked at these anyhow, but seems cleaner. * dbus/dbus-string.h (_DBUS_STRING_ALLOCATION_PADDING): move allocation padding macro to this header; use it to implement (_DBUS_STRING_STATIC): ability to declare a static string. * dbus/dbus-message.c (_dbus_message_has_type_interface_member): change to return TRUE if the interface is not set. * dbus/dbus-string.[hc]: move the D-BUS specific validation stuff to dbus-marshal-validate.[hc] * dbus/dbus-marshal-basic.c (_dbus_type_to_string): move here from dbus-internals.c * dbus/Makefile.am: cut over from dbus-marshal.[hc] to dbus-marshal-*.[hc] * dbus/dbus-object-tree.c (_dbus_decompose_path): move this function here from dbus-marshal.c
134 lines
2.9 KiB
C
134 lines
2.9 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* dbus-gutils.c Utils shared between convenience lib and installed lib
|
|
*
|
|
* Copyright (C) 2003 Red Hat, Inc.
|
|
*
|
|
* Licensed under the Academic Free License version 2.1
|
|
*
|
|
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include "dbus-gutils.h"
|
|
#include "dbus-gtest.h"
|
|
#include <string.h>
|
|
|
|
#ifndef DOXYGEN_SHOULD_SKIP_THIS
|
|
|
|
char**
|
|
_dbus_gutils_split_path (const char *path)
|
|
{
|
|
int len;
|
|
char **split;
|
|
int n_components;
|
|
int i, j, comp;
|
|
|
|
len = strlen (path);
|
|
|
|
n_components = 0;
|
|
i = 0;
|
|
while (i < len)
|
|
{
|
|
if (path[i] == '/')
|
|
n_components += 1;
|
|
++i;
|
|
}
|
|
|
|
split = g_new0 (char*, n_components + 1);
|
|
|
|
comp = 0;
|
|
i = 0;
|
|
while (i < len)
|
|
{
|
|
if (path[i] == '/')
|
|
++i;
|
|
j = i;
|
|
|
|
while (j < len && path[j] != '/')
|
|
++j;
|
|
|
|
/* Now [i, j) is the path component */
|
|
g_assert (i < j);
|
|
g_assert (path[i] != '/');
|
|
g_assert (j == len || path[j] == '/');
|
|
|
|
split[comp] = g_strndup (&path[i], j - i + 1);
|
|
|
|
split[comp][j-i] = '\0';
|
|
|
|
++comp;
|
|
i = j;
|
|
}
|
|
g_assert (i == len);
|
|
|
|
return split;
|
|
}
|
|
|
|
const char *
|
|
_dbus_gutils_type_to_string (int type)
|
|
{
|
|
switch (type)
|
|
{
|
|
case DBUS_TYPE_INVALID:
|
|
return "invalid";
|
|
case DBUS_TYPE_BOOLEAN:
|
|
return "boolean";
|
|
case DBUS_TYPE_BYTE:
|
|
return "byte";
|
|
case DBUS_TYPE_INT32:
|
|
return "int32";
|
|
case DBUS_TYPE_UINT32:
|
|
return "uint32";
|
|
case DBUS_TYPE_DOUBLE:
|
|
return "double";
|
|
case DBUS_TYPE_STRING:
|
|
return "string";
|
|
case DBUS_TYPE_OBJECT_PATH:
|
|
return "object_path";
|
|
case DBUS_TYPE_SIGNATURE:
|
|
return "signature";
|
|
case DBUS_TYPE_STRUCT:
|
|
return "struct";
|
|
case DBUS_TYPE_ARRAY:
|
|
return "array";
|
|
case DBUS_TYPE_VARIANT:
|
|
return "variant";
|
|
case DBUS_STRUCT_BEGIN_CHAR:
|
|
return "begin_struct";
|
|
case DBUS_STRUCT_END_CHAR:
|
|
return "end_struct";
|
|
default:
|
|
return "unknown";
|
|
}
|
|
}
|
|
|
|
#ifdef DBUS_BUILD_TESTS
|
|
|
|
/**
|
|
* @ingroup DBusGLibInternals
|
|
* Unit test for GLib utils internals
|
|
* @returns #TRUE on success.
|
|
*/
|
|
gboolean
|
|
_dbus_gutils_test (const char *test_data_dir)
|
|
{
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
#endif /* DBUS_BUILD_TESTS */
|
|
|
|
#endif /* DOXYGEN_SHOULD_SKIP_THIS */
|