sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3-printing: no need to define struct table_node 4 times.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2009-05-12 14:15:01 +02:00
parent 077327a923
commit 652251701d
5 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/include/nt_printing.h
View File

@ -475,4 +475,10 @@ typedef struct _Printer{
#define DRIVER_ANY_VERSION 0xffffffff
#define DRIVER_MAX_VERSION 4
struct print_architecture_table_node {
const char *long_archi;
const char *short_archi;
int version;
};
#endif /* NT_PRINTING_H_ */

8
source3/printing/nt_printing.c
View File

@ -204,13 +204,7 @@ static const nt_forms_struct default_forms[] = {
{"PRC Envelope #10 Rotated",0x1,0x6fd10,0x4f1a0,0x0,0x0,0x6fd10,0x4f1a0}
};
struct table_node {
const char *long_archi;
const char *short_archi;
int version;
};
static const struct table_node archi_table[]= {
static const struct print_architecture_table_node archi_table[]= {
{"Windows 4.0", SPL_ARCH_WIN40, 0 },
{"Windows NT x86", SPL_ARCH_W32X86, 2 },

8
source3/rpc_server/srv_spoolss_nt.c
View File

@ -53,12 +53,6 @@ extern userdom_struct current_user_info;
#define MAGIC_DISPLAY_FREQUENCY 0xfade2bad
#define PHANTOM_DEVMODE_KEY "_p_f_a_n_t_0_m_"
struct table_node {
const char *long_archi;
const char *short_archi;
int version;
};
static Printer_entry *printers_list;
typedef struct _counter_printer_0 {
@ -2079,7 +2073,7 @@ WERROR _spoolss_DeletePrinter(pipes_struct *p,
static int get_version_id(const char *arch)
{
int i;
struct table_node archi_table[]= {
struct print_architecture_table_node archi_table[]= {
{"Windows 4.0", "WIN40", 0 },
{"Windows NT x86", "W32X86", 2 },

8
source3/rpcclient/cmd_spoolss.c
View File

@ -32,12 +32,6 @@
W_ERROR_HAVE_NO_MEMORY(_printername); \
}
struct table_node {
const char *long_archi;
const char *short_archi;
int version;
};
/* The version int is used by getdrivers. Note that
all architecture strings that support mutliple
versions must be grouped together since enumdrivers
@ -45,7 +39,7 @@ struct table_node {
enumdriver calls for the same arch */
static const struct table_node archi_table[]= {
static const struct print_architecture_table_node archi_table[]= {
{"Windows 4.0", "WIN40", 0 },
{"Windows NT x86", "W32X86", 2 },

9
source3/utils/net_rpc_printer.c
View File

@ -19,15 +19,8 @@
#include "includes.h"
#include "utils/net.h"
struct table_node {
const char *long_archi;
const char *short_archi;
int version;
};
/* support itanium as well */
static const struct table_node archi_table[]= {
static const struct print_architecture_table_node archi_table[]= {
{"Windows 4.0", "WIN40", 0 },
{"Windows NT x86", "W32X86", 2 },