Просмотр исходного кода

dpkg: Use dpkg_arch_get_native() instead of native_arch

Guillem Jover лет назад: 15
Родитель
Сommit
1201dc561b
4 измененных файлов с 2 добавлено и 4 удалено
  1. 1 1
      src/enquiry.c
  2. 0 1
      src/main.c
  3. 0 1
      src/main.h
  4. 1 1
      src/processarc.c

+ 1 - 1
src/enquiry.c

@@ -459,7 +459,7 @@ printarch(const char *const *argv)
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  printf("%s\n", native_arch);
+  printf("%s\n", dpkg_arch_get_native()->name);
 
   m_output(stdout, _("<standard output>"));
 

+ 0 - 1
src/main.c

@@ -165,7 +165,6 @@ usage(const struct cmdinfo *ci, const char *value)
   exit(0);
 }
 
-const char native_arch[] = ARCHITECTURE;
 static const char printforhelp[] = N_(
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use `dselect' or `aptitude' for user-friendly package management;\n"

+ 0 - 1
src/main.h

@@ -139,7 +139,6 @@ extern bool abort_processing;
 extern int errabort;
 extern const char *instdir;
 extern struct pkg_list *ignoredependss;
-extern const char native_arch[];
 
 struct invoke_hook {
 	struct invoke_hook *next;

+ 1 - 1
src/processarc.c

@@ -500,7 +500,7 @@ void process_archive(const char *filename) {
       pkg->available.arch->type != arch_native)
     forcibleerr(fc_architecture,
                 _("package architecture (%s) does not match system (%s)"),
-                pkg->available.arch->name, native_arch);
+                pkg->available.arch->name, dpkg_arch_get_native()->name);
 
   for (deconpil= deconfigure;
        deconpil;