s3-spoolss: remove another duplicate copy of print_architecture_table.
authorGünther Deschner <gd@samba.org>
Wed, 12 Aug 2009 12:59:44 +0000 (14:59 +0200)
committerGünther Deschner <gd@samba.org>
Mon, 17 Aug 2009 16:09:11 +0000 (18:09 +0200)
Guenther

source3/rpc_server/srv_spoolss_nt.c

index e535f26a83012822e00ad1cb9ed993904bd7994d..cd14b5ed2ad8d808ac8c066520a40b05c6f034d5 100644 (file)
@@ -2057,20 +2057,21 @@ WERROR _spoolss_DeletePrinter(pipes_struct *p,
  * long architecture string
  ******************************************************************/
 
+static const struct print_architecture_table_node archi_table[]= {
+
+       {"Windows 4.0",          SPL_ARCH_WIN40,        0 },
+       {"Windows NT x86",       SPL_ARCH_W32X86,       2 },
+       {"Windows NT R4000",     SPL_ARCH_W32MIPS,      2 },
+       {"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA,     2 },
+       {"Windows NT PowerPC",   SPL_ARCH_W32PPC,       2 },
+       {"Windows IA64",         SPL_ARCH_IA64,         3 },
+       {"Windows x64",          SPL_ARCH_X64,          3 },
+       {NULL,                   "",            -1 }
+};
+
 static int get_version_id(const char *arch)
 {
        int i;
-       struct print_architecture_table_node archi_table[]= {
-
-               {"Windows 4.0",          "WIN40",       0 },
-               {"Windows NT x86",       "W32X86",      2 },
-               {"Windows NT R4000",     "W32MIPS",     2 },
-               {"Windows NT Alpha_AXP", "W32ALPHA",    2 },
-               {"Windows NT PowerPC",   "W32PPC",      2 },
-               {"Windows IA64",         "IA64",        3 },
-               {"Windows x64",          "x64",         3 },
-               {NULL,                   "",            -1 }
-       };
 
        for (i=0; archi_table[i].long_archi != NULL; i++)
        {
@@ -6714,18 +6715,6 @@ WERROR _spoolss_SetJob(pipes_struct *p,
        return errcode;
 }
 
-static const struct print_architecture_table_node archi_table[]= {
-
-       {"Windows 4.0",          SPL_ARCH_WIN40,        0 },
-       {"Windows NT x86",       SPL_ARCH_W32X86,       2 },
-       {"Windows NT R4000",     SPL_ARCH_W32MIPS,      2 },
-       {"Windows NT Alpha_AXP", SPL_ARCH_W32ALPHA,     2 },
-       {"Windows NT PowerPC",   SPL_ARCH_W32PPC,       2 },
-       {"Windows IA64",         SPL_ARCH_IA64,         3 },
-       {"Windows x64",          SPL_ARCH_X64,          3 },
-       {NULL,                   "",            -1 }
-};
-
 /****************************************************************************
  Enumerates all printer drivers by level and architecture.
 ****************************************************************************/