mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-30 06:10:11 +01:00
24adbe3fa4
* src/NetworkManagerUtils.c
(nm_utils_is_empty_ssid):
(nm_utils_escape_ssid):
(nm_utils_same_ssid): Remove. These functions are copied and
pasted in a
lot of places, so they belong to libnm-utils instead.
Now with 100% less compiler warnings:
* libnm-util/nm-utils.c (nm_dbus_escape_object_path): Remove,
* unused.
(nm_dbus_unescape_object_path): Ditto.
(nm_utils_ssid_to_utf8): Ditto.
(nm_utils_is_empty_ssid): Move here from
src/NetworkManagerUtils.c
(nm_utils_escape_ssid): Ditto.
(nm_utils_same_ssid): Ditto.
* src/nm-manager.c: Include 'netinet/ether.h' for ether_aton_r.
(add_one_connection_element): Remove an unused variable.
(impl_manager_get_active_connections): Ditto.
* src/NetworkManagerPolicy.c (get_device_connection): Remove an
* unused
variable.
* src/nm-dbus-manager.c (nm_dbus_manager_start_service): Remove
* a leftover
from the previous commit.
* src/nm-device-802-11-wireless.c (set_current_ap): Remove
* unused variable.
(real_act_stage1_prepare): Ditto.
(activation_success_handler): Ditto.
(get_property): Ditto.
* src/nm-device-802-3-ethernet.c (real_get_best_connection):
* Remove unused
variable.
* src/ppp-manager/nm-pppd-plugin.c (nm_ip_up): Remove the check
* for 'ifname',
it's always set.
* src/supplicant-manager/nm-supplicant-config.c
(nm_supplicant_config_add_setting_wireless): Cast the
GByteArray's 'guint8 *'
to expected "char *".
(nm_supplicant_config_add_setting_wireless): Ditto.
(nm_supplicant_config_remove_option): Remove, not used.
* libnm-glib/libnm-glib-test.c (dump_access_point): Frequency is
* a guint32,
not double.
(test_wireless_enabled): Ifdef out unused function.
(device_deactivate): Ditto.
(device_state_changed): Ditto.
(nm_utils_is_empty_ssid): Remove, it's now in libnm-utils.
(nm_utils_escape_ssid): Ditto.
* test/nm-tool.c (nm_utils_escape_ssid): Remove, it's now in
* libnm-utils.
(nm_utils_is_empty_ssid): Ditto.
* libnm-glib/nm-client.c
* (nm_client_free_active_connection_element): Remove
unused variable.
* libnm-util/nm-setting.c (setting_wireless_destroy): Remove
* unused variable.
(setting_vpn_properties_update_secrets): Ditto.
(int_to_gvalue): Ifdef out for now, not used.
(byte_to_gvalue): Ditto.
* libnm-util/dbus-dict-helpers.c
* (_nmu_dbus_add_dict_entry_string_array):
Unused, remove.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2960 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
140 lines
3.9 KiB
C
140 lines
3.9 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
/* NetworkManager -- Network link manager
|
|
*
|
|
* Ray Strode <rstrode@redhat.com>
|
|
*
|
|
* 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.
|
|
*
|
|
* (C) Copyright 2005 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef NM_UTILS_H
|
|
#define NM_UTILS_H
|
|
|
|
#include <glib.h>
|
|
#include <execinfo.h>
|
|
#include <dbus/dbus.h>
|
|
|
|
#define nm_print_backtrace() \
|
|
G_STMT_START \
|
|
{ \
|
|
void *_call_stack[512]; \
|
|
int _call_stack_size; \
|
|
char **_symbols; \
|
|
_call_stack_size = backtrace (_call_stack, \
|
|
G_N_ELEMENTS (_call_stack)); \
|
|
_symbols = backtrace_symbols (_call_stack, _call_stack_size); \
|
|
if (_symbols != NULL) \
|
|
{ \
|
|
int _i; \
|
|
_i = 0; \
|
|
g_critical ("traceback:\n"); \
|
|
while (_i < _call_stack_size) \
|
|
{ \
|
|
g_critical ("\t%s\n", _symbols[_i]); \
|
|
_i++; \
|
|
} \
|
|
free (_symbols); \
|
|
} \
|
|
} \
|
|
G_STMT_END
|
|
|
|
#define nm_get_timestamp(timestamp) \
|
|
G_STMT_START \
|
|
{ \
|
|
GTimeVal _tv; \
|
|
g_get_current_time (&_tv); \
|
|
*timestamp = (_tv.tv_sec * (1.0 * G_USEC_PER_SEC) + \
|
|
_tv.tv_usec) / G_USEC_PER_SEC; \
|
|
} \
|
|
G_STMT_END
|
|
|
|
#define nm_info(fmt, args...) \
|
|
G_STMT_START \
|
|
{ \
|
|
g_message ("<info> " fmt "\n", ##args); \
|
|
} G_STMT_END
|
|
|
|
#define nm_info_str(fmt_str, args...) \
|
|
G_STMT_START \
|
|
{ \
|
|
g_message ("<info> %s\n", fmt_str, ##args); \
|
|
} G_STMT_END
|
|
|
|
#define nm_debug(fmt, args...) \
|
|
G_STMT_START \
|
|
{ \
|
|
gdouble _timestamp; \
|
|
nm_get_timestamp (&_timestamp); \
|
|
g_debug ("<debug> [%f] %s(): " fmt "\n", _timestamp, \
|
|
G_STRFUNC, ##args); \
|
|
} G_STMT_END
|
|
|
|
#define nm_debug_str(fmt_str, args...) \
|
|
G_STMT_START \
|
|
{ \
|
|
gdouble _timestamp; \
|
|
nm_get_timestamp (&_timestamp); \
|
|
g_debug ("<debug> [%f] %s(): %s\n", _timestamp, \
|
|
G_STRFUNC, fmt_str, ##args); \
|
|
} G_STMT_END
|
|
|
|
#define nm_warning(fmt, args...) \
|
|
G_STMT_START \
|
|
{ \
|
|
g_warning ("<WARN> %s(): " fmt "\n", \
|
|
G_STRFUNC, ##args); \
|
|
} G_STMT_END
|
|
|
|
#define nm_warning_str(fmt_str, args...) \
|
|
G_STMT_START \
|
|
{ \
|
|
g_warning ("<WARN> %s(): %s\n", \
|
|
G_STRFUNC, fmt_str, ##args); \
|
|
} G_STMT_END
|
|
|
|
#define nm_error(fmt, args...) \
|
|
G_STMT_START \
|
|
{ \
|
|
gdouble _timestamp; \
|
|
nm_get_timestamp (&_timestamp); \
|
|
g_critical ("<ERROR>\t[%f] %s (): " fmt "\n", _timestamp, \
|
|
G_STRFUNC, ##args); \
|
|
nm_print_backtrace (); \
|
|
G_BREAKPOINT (); \
|
|
} G_STMT_END
|
|
|
|
#define nm_error_str(fmt_str, args...) \
|
|
G_STMT_START \
|
|
{ \
|
|
gdouble _timestamp; \
|
|
nm_get_timestamp (&_timestamp); \
|
|
g_critical ("<ERROR>\t[%f] %s (): %s\n", _timestamp, \
|
|
G_STRFUNC, fmt_str, ##args); \
|
|
nm_print_backtrace (); \
|
|
G_BREAKPOINT (); \
|
|
} G_STMT_END
|
|
|
|
/* SSID helpers */
|
|
gboolean nm_utils_is_empty_ssid (const char * ssid, int len);
|
|
const char *nm_utils_escape_ssid (const guint8 *ssid, guint32 len);
|
|
gboolean nm_utils_same_ssid (const GByteArray * ssid1,
|
|
const GByteArray * ssid2,
|
|
gboolean ignore_trailing_null);
|
|
|
|
GHashTable *nm_utils_gvalue_hash_dup (GHashTable *hash);
|
|
char *nm_utils_garray_to_string (GArray *array);
|
|
|
|
#endif /* NM_UTILS_H */
|