mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-22 21:50:09 +01:00
2b97fb81a5
* glib/dbus-gidl.c (property_info_get_type, arg_info_get_type): Change return value to const char * instead of int so we can do full signatures. (struct PropertyInfo, struct ArgInfo): Store char *. (property_info_new, arg_info_new): Update parameters, strdup. (property_info_unref, arg_info_unref): Free. * glib/dbus-gidl.h: Update prototypes. * glib/dbus-gparser.c (basic_type_from_string): Delete. (validate_signature): New function, just validates signature and sets GError. (parse_property, parse_arg): Invoke validate_signature. Store signature instead of just type code. * glib/dbus-gvalue.c (base_type_from_signature): New utility function to return a primary type for a signature, dropping information about types in container types. (dbus_gvalue_genmarshal_name_from_type) (dbus_gvalue_binding_type_from_type) (dbus_gvalue_ctype_from_type): Update to take full signature instead of type code. (dbus_gtype_to_dbus_type): Moved here from glib/dbus-gobject.c. * glib/dbus-gvalue.h: Update prototypes for above. * glib/dbus-gobject.c (gtype_to_dbus_type): Moved to glib/dbus-gvalue.c as dbus_gtype_to_dbus_type. (introspect_properties, introspect_signals, write_interface): Update to handle signatures, and remove usage of _dbus_gutils_type_to_string. (handle_introspect): Print out type codes instead of e.g. "string" in hardcoded introspection XML; also use x_AS_STRING constants instead of hardcoding in string. * glib/dbus-glib-tool.c (pretty_print): Handle signature change to string. Remove usage of _dbus_gutils_type_to_string. * glib/dbus-gutils.c (_dbus_gutils_type_to_string): Delete. * glib/dbus-gutils.h (_dbus_gutils_type_to_string): Update for deletion. * glib/dbus-binding-tool-glib.c (compute_marshaller) (compute_marshaller_name, generate_glue): Handle signature change to string. (write_formal_parameters, write_args_for_direction): Ditto, and remove FIXME. * tools/dbus-tree-view.c (type_to_string): Delete. (info_set_func_text): Update to print full signatures. * test/glib/test-service-glib.xml: Change types to new introspection format.
130 lines
2.7 KiB
C
130 lines
2.7 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;
|
|
if (path[1] != '\0') /* if not "/" */
|
|
{
|
|
i = 0;
|
|
while (i < len)
|
|
{
|
|
if (path[i] == '/')
|
|
n_components += 1;
|
|
++i;
|
|
}
|
|
}
|
|
|
|
split = g_new0 (char*, n_components + 1);
|
|
|
|
comp = 0;
|
|
if (n_components == 0)
|
|
i = 1;
|
|
else
|
|
i = 0;
|
|
while (comp < n_components)
|
|
{
|
|
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;
|
|
}
|
|
|
|
char*
|
|
_dbus_gutils_wincaps_to_uscore (const char *caps)
|
|
{
|
|
const char *p;
|
|
GString *str;
|
|
|
|
str = g_string_new (NULL);
|
|
p = caps;
|
|
while (*p)
|
|
{
|
|
if (g_ascii_isupper (*p))
|
|
{
|
|
if (str->len > 0 &&
|
|
(str->len < 2 || str->str[str->len-2] != '_'))
|
|
g_string_append_c (str, '_');
|
|
g_string_append_c (str, g_ascii_tolower (*p));
|
|
}
|
|
else
|
|
{
|
|
g_string_append_c (str, *p);
|
|
}
|
|
++p;
|
|
}
|
|
|
|
return g_string_free (str, FALSE);
|
|
}
|
|
|
|
|
|
#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 */
|