summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-08-12 14:59:44 +0200
committerGünther Deschner <gd@samba.org>2009-08-17 18:09:11 +0200
commit53196955d47293ebf5956ddbdbbbc131e7116a78 (patch)
tree026776c35dee94cf8cf33da4e52dbc5b762f1b31 /source3
parent1b09e36f0bc1942a5156715db21aed1ad403800e (diff)
downloadsamba-53196955d47293ebf5956ddbdbbbc131e7116a78.tar.gz
samba-53196955d47293ebf5956ddbdbbbc131e7116a78.tar.bz2
samba-53196955d47293ebf5956ddbdbbbc131e7116a78.zip
s3-spoolss: remove another duplicate copy of print_architecture_table.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c35
1 files changed, 12 insertions, 23 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index e535f26a83..cd14b5ed2a 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -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.
****************************************************************************/