Kaynağa Gözat

Use named intializers in structures

Guillem Jover 17 yıl önce
ebeveyn
işleme
69e3c912bb
4 değiştirilmiş dosya ile 23 ekleme ve 19 silme
  1. 9 9
      lib/dpkg/triglib.c
  2. 6 2
      src/processarc.c
  3. 3 3
      src/trigcmd.c
  4. 5 5
      src/trigproc.c

+ 9 - 9
lib/dpkg/triglib.c

@@ -228,10 +228,10 @@ struct trigkindinfo {
 
 #define TKI_DEFINE(kindname)				\
   static const struct trigkindinfo tki_##kindname= {	\
-    trk_##kindname##_activate_start,			\
-    trk_##kindname##_activate_awaiter,			\
-    trk_##kindname##_activate_done,			\
-    trk_##kindname##_interest_change			\
+    .activate_start = trk_##kindname##_activate_start,		\
+    .activate_awaiter = trk_##kindname##_activate_awaiter,	\
+    .activate_done = trk_##kindname##_activate_done,		\
+    .interest_change = trk_##kindname##_interest_change,	\
   };
 
 static const struct trigkindinfo *dtki;
@@ -796,10 +796,10 @@ th_simple_nn_find(const char *name, int nonew)
 TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS
 
 struct trig_hooks trigh = {
-	NULL,
-	NULL,
-	th_simple_nn_find,
-	th_nn_interested,
-	th_nn_name
+	.enqueue_deferred = NULL,
+	.transitional_activate = NULL,
+	.namenode_find = th_simple_nn_find,
+	.namenode_interested = th_nn_interested,
+	.namenode_name = th_nn_name,
 };
 

+ 6 - 2
src/processarc.c

@@ -51,8 +51,12 @@
 
 void process_archive(const char *filename) {
   static const struct TarFunctions tf = {
-    tarfileread,
-    tarobject, tarobject, tarobject, tarobject, tarobject
+    .Read = tarfileread,
+    .ExtractFile = tarobject,
+    .MakeDirectory = tarobject,
+    .MakeHardLink = tarobject,
+    .MakeSymbolicLink = tarobject,
+    .MakeSpecialFile = tarobject,
   };
 
   /* These need to be static so that we can pass their addresses to

+ 3 - 3
src/trigcmd.c

@@ -140,9 +140,9 @@ tdm_add_trig_end(void)
 }
 
 static const struct trigdefmeths tdm_add = {
-	tdm_add_trig_begin,
-	tdm_add_package,
-	tdm_add_trig_end
+	.trig_begin = tdm_add_trig_begin,
+	.package = tdm_add_package,
+	.trig_end = tdm_add_trig_end,
 };
 
 static void

+ 5 - 5
src/trigproc.c

@@ -388,11 +388,11 @@ th_proper_nn_find(const char *name, int nonew)
 TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS
 
 static const struct trig_hooks trig_our_hooks = {
-	trigproc_enqueue_deferred,
-	trig_transitional_activate,
-	th_proper_nn_find,
-	th_nn_interested,
-	th_nn_name
+	.enqueue_deferred = trigproc_enqueue_deferred,
+	.transitional_activate = trig_transitional_activate,
+	.namenode_find = th_proper_nn_find,
+	.namenode_interested = th_nn_interested,
+	.namenode_name = th_nn_name,
 };
 
 void