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

spoolss: rename RPC_PrintNamedProperty to spoolss_PrintNamedProperty

Browse Source 
We should try to avoid the RPC_ prefix in structs, enums for spoolss.

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Günther Deschner 2016-09-07 07:50:14 +02:00
parent 1e4ea50a4c
commit c6d700ee1f
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
librpc/idl/spoolss.idl
View File

@ -3357,36 +3357,36 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
kRpcPropertyTypeInt64 = 3,
kRpcPropertyTypeByte = 4,
kRpcPropertyTypeBuffer = 5
} RPC_EPrintPropertyType;
} spoolss_EPrintPropertyType;
typedef struct {
uint32 cbBuf;
[size_is(cbBuf)] uint8 *pBuf;
} propertyBlob;
typedef [ms_union,switch_type(RPC_EPrintPropertyType)] union {
typedef [ms_union,switch_type(spoolss_EPrintPropertyType)] union {
[case(kRpcPropertyTypeString)] [string,charset(UTF16)] uint16 *propertyString;
[case(kRpcPropertyTypeInt32)] uint32 propertyInt32;
[case(kRpcPropertyTypeInt64)] hyper propertyInt64;
[case(kRpcPropertyTypeByte)] uint8 propertyByte;
[case(kRpcPropertyTypeBuffer)] propertyBlob propertyBlob;
} RPC_PrintPropertyValueUnion;
} spoolss_PrintPropertyValueUnion;
typedef [public] struct {
RPC_EPrintPropertyType ePropertyType;
[switch_is(ePropertyType)] RPC_PrintPropertyValueUnion value;
} RPC_PrintPropertyValue;
spoolss_EPrintPropertyType ePropertyType;
[switch_is(ePropertyType)] spoolss_PrintPropertyValueUnion value;
} spoolss_PrintPropertyValue;
typedef [public] struct {
[string,charset(UTF16)] uint16 *propertyName;
RPC_PrintPropertyValue propertyValue;
} RPC_PrintNamedProperty;
spoolss_PrintPropertyValue propertyValue;
} spoolss_PrintNamedProperty;
WERROR spoolss_GetJobNamedPropertyValue(
[in,ref] policy_handle *hPrinter,
[in] uint32 JobId,
[in] [string,charset(UTF16)] uint16 *pszName,
[out,ref] RPC_PrintPropertyValue *pValue
[out,ref] spoolss_PrintPropertyValue *pValue
);
/******************/
@ -3394,7 +3394,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
[public] WERROR spoolss_SetJobNamedProperty(
[in,ref] policy_handle *hPrinter,
[in] uint32 JobId,
[in,ref] RPC_PrintNamedProperty *pProperty
[in,ref] spoolss_PrintNamedProperty *pProperty
);
/******************/
@ -3411,7 +3411,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor")
[in,ref] policy_handle *hPrinter,
[in] uint32 JobId,
[out,ref] uint32 *pcProperties,
[out,ref,size_is(,*pcProperties)] RPC_PrintNamedProperty **ppProperties
[out,ref,size_is(,*pcProperties)] spoolss_PrintNamedProperty **ppProperties
);
/******************/

18
source4/torture/rpc/spoolss.c
View File

@ -3317,7 +3317,7 @@ static bool test_JobPropertiesEnum(struct torture_context *tctx,
{
struct spoolss_EnumJobNamedProperties r;
uint32_t pcProperties = 0;
struct RPC_PrintNamedProperty *ppProperties = NULL;
struct spoolss_PrintNamedProperty *ppProperties = NULL;
r.in.hPrinter = handle;
r.in.JobId = job_id;
@ -3339,7 +3339,7 @@ static bool test_JobPropertySet(struct torture_context *tctx,
struct dcerpc_binding_handle *b,
struct policy_handle *handle,
uint32_t job_id,
struct RPC_PrintNamedProperty *property)
struct spoolss_PrintNamedProperty *property)
{
struct spoolss_SetJobNamedProperty r;
@ -3365,7 +3365,7 @@ static bool test_JobPropertyGetValue(struct torture_context *tctx,
struct policy_handle *handle,
uint32_t job_id,
const char *property_name,
struct RPC_PrintPropertyValue *value)
struct spoolss_PrintPropertyValue *value)
{
struct spoolss_GetJobNamedPropertyValue r;
@ -3663,8 +3663,8 @@ static bool test_DoPrintTest_extended(struct torture_context *tctx,
}
static bool test_JobPrintProperties_equal(struct torture_context *tctx,
struct RPC_PrintPropertyValue *got,
struct RPC_PrintNamedProperty *exp)
struct spoolss_PrintPropertyValue *got,
struct spoolss_PrintNamedProperty *exp)
{
torture_assert_int_equal(tctx,
got->ePropertyType,
@ -3719,14 +3719,14 @@ static bool test_JobPrintProperties(struct torture_context *tctx,
struct policy_handle *handle,
uint32_t job_id)
{
struct RPC_PrintNamedProperty in;
struct RPC_PrintPropertyValue out;
struct spoolss_PrintNamedProperty in;
struct spoolss_PrintPropertyValue out;
int i;
DATA_BLOB blob = data_blob_string_const("blob");
struct {
const char *property_name;
enum RPC_EPrintPropertyType type;
union RPC_PrintPropertyValueUnion value;
enum spoolss_EPrintPropertyType type;
union spoolss_PrintPropertyValueUnion value;
WERROR expected_result;
} tests[] = {
{