Преглед изворни кода

dpkg-deb: Move known_arbitrary_field() closer to do_build()

Guillem Jover пре 15 година
родитељ
комит
0cabc7648d
1 измењених фајлова са 28 додато и 28 уклоњено
  1. 28 28
      dpkg-deb/build.c

+ 28 - 28
dpkg-deb/build.c

@@ -57,34 +57,6 @@ struct file_info {
   char*	fn;
   char*	fn;
 };
 };
 
 
-static const char *arbitrary_fields[] = {
-  "Package-Type",
-  "Subarchitecture",
-  "Kernel-Version",
-  "Installer-Menu-Item",
-  "Homepage",
-  "Tag",
-  NULL
-};
-
-static const char private_prefix[] = "Private-";
-
-static bool
-known_arbitrary_field(const struct arbitraryfield *field)
-{
-  const char **known;
-
-  /* Always accept fields starting with a private field prefix. */
-  if (strncasecmp(field->name, private_prefix, strlen(private_prefix)) == 0)
-    return true;
-
-  for (known= arbitrary_fields; *known; known++)
-    if (strcasecmp(field->name, *known) == 0)
-      return true;
-
-  return false;
-}
-
 static struct file_info *
 static struct file_info *
 file_info_new(const char *filename)
 file_info_new(const char *filename)
 {
 {
@@ -329,6 +301,34 @@ check_conffiles(const char *dir)
   return warns;
   return warns;
 }
 }
 
 
+static const char *arbitrary_fields[] = {
+  "Package-Type",
+  "Subarchitecture",
+  "Kernel-Version",
+  "Installer-Menu-Item",
+  "Homepage",
+  "Tag",
+  NULL
+};
+
+static const char private_prefix[] = "Private-";
+
+static bool
+known_arbitrary_field(const struct arbitraryfield *field)
+{
+  const char **known;
+
+  /* Always accept fields starting with a private field prefix. */
+  if (strncasecmp(field->name, private_prefix, strlen(private_prefix)) == 0)
+    return true;
+
+  for (known = arbitrary_fields; *known; known++)
+    if (strcasecmp(field->name, *known) == 0)
+      return true;
+
+  return false;
+}
+
 /**
 /**
  * Overly complex function that builds a .deb file.
  * Overly complex function that builds a .deb file.
  */
  */