about summary refs log tree commit diff
path: root/src/nm-exported-object.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nm-exported-object.c')
-rw-r--r--src/nm-exported-object.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/nm-exported-object.c b/src/nm-exported-object.c
index cd0789ee..0e903b89 100644
--- a/src/nm-exported-object.c
+++ b/src/nm-exported-object.c
@@ -77,8 +77,7 @@ typedef struct {
 	GArray *methods;
 } NMExportedObjectClassInfo;
 
-GQuark nm_exported_object_class_info_quark (void);
-G_DEFINE_QUARK (NMExportedObjectClassInfo, nm_exported_object_class_info)
+static NM_CACHED_QUARK_FCN ("NMExportedObjectClassInfo", nm_exported_object_class_info_quark)
 
 /*****************************************************************************/
 
@@ -388,8 +387,7 @@ nm_exported_object_meta_marshal (GClosure *closure, GValue *return_value,
 	g_free (local_param_values);
 }
 
-GQuark _skeleton_data_quark (void);
-G_DEFINE_QUARK (skeleton-data, _skeleton_data);
+static NM_CACHED_QUARK_FCN ("skeleton-data", _skeleton_data_quark)
 
 typedef struct {
 	GBinding **prop_bindings;
@@ -595,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
 	}