Commit b1eeb009 authored by Thomas Haller's avatar Thomas Haller

all: use "unsigned long" instead of "long unsigned"

parent e207e534
......@@ -1605,7 +1605,7 @@ read_one_setting_value (NMSetting *setting,
else {
if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
_("too large FLAGS property '%s' (%llu)"),
G_VALUE_TYPE_NAME (value), (long long unsigned) uint_val))
G_VALUE_TYPE_NAME (value), (unsigned long long) uint_val))
goto out_error;
}
}
......
......@@ -8634,7 +8634,7 @@ check_and_reapply_connection (NMDevice *self,
nm_active_connection_version_id_bump ((NMActiveConnection *) priv->act_request);
_LOGD (LOGD_DEVICE, "reapply (version-id %llu%s)",
(long long unsigned) nm_active_connection_version_id_get (((NMActiveConnection *) priv->act_request)),
(unsigned long long) nm_active_connection_version_id_get (((NMActiveConnection *) priv->act_request)),
diffs ? "" : " (unmodified)");
if (diffs) {
......@@ -10919,7 +10919,7 @@ nm_device_reapply_settings_immediately (NMDevice *self)
nm_setting_connection_get_zone (s_con_applied)) != 0) {
version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->_priv->act_request);
_LOGD (LOGD_DEVICE, "reapply setting: zone = %s%s%s (version-id %llu)", NM_PRINT_FMT_QUOTE_STRING (zone), (long long unsigned) version_id);
_LOGD (LOGD_DEVICE, "reapply setting: zone = %s%s%s (version-id %llu)", NM_PRINT_FMT_QUOTE_STRING (zone), (unsigned long long) version_id);
g_object_set (G_OBJECT (s_con_applied),
NM_SETTING_CONNECTION_ZONE, zone,
......@@ -10931,7 +10931,7 @@ nm_device_reapply_settings_immediately (NMDevice *self)
if ((metered = nm_setting_connection_get_metered (s_con_settings)) != nm_setting_connection_get_metered (s_con_applied)) {
version_id = nm_active_connection_version_id_bump ((NMActiveConnection *) self->_priv->act_request);
_LOGD (LOGD_DEVICE, "reapply setting: metered = %d (version-id %llu)", (int) metered, (long long unsigned) version_id);
_LOGD (LOGD_DEVICE, "reapply setting: metered = %d (version-id %llu)", (int) metered, (unsigned long long) version_id);
g_object_set (G_OBJECT (s_con_applied),
NM_SETTING_CONNECTION_METERED, metered,
......
......@@ -571,7 +571,7 @@ nm_dhcp_client_stop_existing (const char *pid_file, const char *binary_name)
if (start_time == 0)
goto out;
nm_sprintf_buf (proc_path, "/proc/%lu/cmdline", (long unsigned) pid);
nm_sprintf_buf (proc_path, "/proc/%lu/cmdline", (unsigned long) pid);
if (!g_file_get_contents (proc_path, &proc_contents, NULL, NULL))
goto out;
......
......@@ -942,7 +942,7 @@ nm_active_connection_version_id_bump (NMActiveConnection *self)
priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self);
priv->version_id = _version_id_new ();
_LOGT ("new version-id %llu", (long long unsigned) priv->version_id);
_LOGT ("new version-id %llu", (unsigned long long) priv->version_id);
return priv->version_id;
}
......@@ -1136,7 +1136,7 @@ constructed (GObject *object)
if (priv->applied_connection)
nm_connection_clear_secrets (priv->applied_connection);
_LOGD ("constructed (%s, version-id %llu)", G_OBJECT_TYPE_NAME (self), (long long unsigned) priv->version_id);
_LOGD ("constructed (%s, version-id %llu)", G_OBJECT_TYPE_NAME (self), (unsigned long long) priv->version_id);
g_return_if_fail (priv->subject);
}
......
......@@ -88,9 +88,9 @@ nm_auth_subject_to_string (NMAuthSubject *self, char *buf, gsize buf_len)
switch (priv->subject_type) {
case NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS:
g_snprintf (buf, buf_len, "unix-process[pid=%lu, uid=%lu, start=%llu]",
(long unsigned) priv->unix_process.pid,
(long unsigned) priv->unix_process.uid,
(long long unsigned) priv->unix_process.start_time);
(unsigned long) priv->unix_process.pid,
(unsigned long) priv->unix_process.uid,
(unsigned long long) priv->unix_process.start_time);
break;
case NM_AUTH_SUBJECT_TYPE_INTERNAL:
g_strlcat (buf, "internal", buf_len);
......
......@@ -976,7 +976,7 @@ nm_utils_kill_process_sync (pid_t pid, guint64 start_time, int sig, NMLogDomain
}
if (start_time != 0 && start_time != start_time0) {
nm_log_dbg (log_domain, LOG_NAME_PROCESS_FMT ": don't kill process %ld because the start_time is unexpectedly %lu instead of %ld",
LOG_NAME_ARGS, (long int) pid, (long unsigned) start_time0, (long unsigned) start_time);
LOG_NAME_ARGS, (long int) pid, (unsigned long) start_time0, (unsigned long) start_time);
return;
}
......
......@@ -593,7 +593,7 @@ _create_export_path (NMExportedObjectClass *klass)
}
NM_PRAGMA_WARNING_DISABLE("-Wformat-nonliteral")
return g_strdup_printf (class_export_path, (long long unsigned) (++(*counter)));
return g_strdup_printf (class_export_path, (unsigned long long) (++(*counter)));
NM_PRAGMA_WARNING_REENABLE
}
......
......@@ -218,7 +218,7 @@ nmtst_platform_ip4_routes_equal (const NMPlatformIP4Route *a, const NMPlatformIP
if (nm_platform_ip4_route_cmp (&a[i], &b[i]) != 0) {
char buf[sizeof (_nm_utils_to_string_buffer)];
g_error ("Error comparing IPv4 route[%lu]: %s vs %s", (long unsigned) i,
g_error ("Error comparing IPv4 route[%lu]: %s vs %s", (unsigned long) i,
nm_platform_ip4_route_to_string (&a[i], NULL, 0),
nm_platform_ip4_route_to_string (&b[i], buf, sizeof (buf)));
g_assert_not_reached ();
......@@ -252,7 +252,7 @@ nmtst_platform_ip6_routes_equal (const NMPlatformIP6Route *a, const NMPlatformIP
if (nm_platform_ip6_route_cmp (&a[i], &b[i]) != 0) {
char buf[sizeof (_nm_utils_to_string_buffer)];
g_error ("Error comparing IPv6 route[%lu]: %s vs %s", (long unsigned) i,
g_error ("Error comparing IPv6 route[%lu]: %s vs %s", (unsigned long) i,
nm_platform_ip6_route_to_string (&a[i], NULL, 0),
nm_platform_ip6_route_to_string (&b[i], buf, sizeof (buf)));
g_assert_not_reached ();
......
......@@ -1595,7 +1595,7 @@ nmtstp_namespace_get_fd_for_process (pid_t pid, const char *ns_name)
g_return_val_if_fail (pid > 0, 0);
g_return_val_if_fail (ns_name && ns_name[0] && strlen (ns_name) < 50, 0);
nm_sprintf_buf (p, "/proc/%lu/ns/%s", (long unsigned) pid, ns_name);
nm_sprintf_buf (p, "/proc/%lu/ns/%s", (unsigned long) pid, ns_name);
return open(p, O_RDONLY | O_CLOEXEC);
}
......
......@@ -751,7 +751,7 @@ _mi_rebucket (GRand *rand, guint num_values, guint num_buckets, NMMultiIndexOper
op == MI_OP_ADD ? "ADD" : (op == MI_OP_REMOVE ? "REM" : "MOV"),
bucket_old, had_bucket_old ? '*' : ' ',
bucket, had_bucket ? '*' : ' ',
(long long unsigned) buckets_old, (long long unsigned) v->buckets,
(unsigned long long) buckets_old, (unsigned long long) v->buckets,
buckets_old != v->buckets ? "(changed)" : "(unchanged)");
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment