diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-09-19 00:12:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:52:19 -0500 |
| commit | 4e7d11449ad419f4fa791e26e059a9f73d6d4042 (patch) | |
| tree | a826e6e5634ae9c3174c5ae3620adfe6dfb03749 /source3/printing | |
| parent | bc82f70e0b66c55ca90c7dec490de478812151c2 (diff) | |
| download | samba-4e7d11449ad419f4fa791e26e059a9f73d6d4042.tar.gz samba-4e7d11449ad419f4fa791e26e059a9f73d6d4042.tar.bz2 samba-4e7d11449ad419f4fa791e26e059a9f73d6d4042.zip | |
r18654: Rename "struct uuid" => "struct GUID" for consistency.
(This used to be commit 5de76767e857e9d159ea46e2ded612ccd6d6bf19)
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/nt_printing.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 8cc0d2f7e2..b74763b2e5 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -3003,7 +3003,7 @@ static BOOL map_nt_printer_info2_to_dsspooler(NT_PRINTER_INFO_LEVEL_2 *info2) } static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2, - struct uuid guid) + struct GUID guid) { int i; REGVAL_CTR *ctr=NULL; @@ -3015,7 +3015,7 @@ static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2, regval_ctr_delvalue(ctr, "objectGUID"); regval_ctr_addvalue(ctr, "objectGUID", REG_BINARY, - (char *) &guid, sizeof(struct uuid)); + (char *) &guid, sizeof(struct GUID)); } static WERROR nt_printer_publish_ads(ADS_STRUCT *ads, @@ -3028,7 +3028,7 @@ static WERROR nt_printer_publish_ads(ADS_STRUCT *ads, TALLOC_CTX *ctx; ADS_MODLIST mods; const char *attrs[] = {"objectGUID", NULL}; - struct uuid guid; + struct GUID guid; WERROR win_rc = WERR_OK; DEBUG(5, ("publishing printer %s\n", printer->info_2->printername)); @@ -3265,7 +3265,7 @@ WERROR check_published_printers(void) } BOOL is_printer_published(Printer_entry *print_hnd, int snum, - struct uuid *guid) + struct GUID *guid) { NT_PRINTER_INFO_LEVEL *printer = NULL; REGVAL_CTR *ctr; @@ -3286,8 +3286,8 @@ BOOL is_printer_published(Printer_entry *print_hnd, int snum, } /* fetching printer guids really ought to be a separate function.. */ - if (guid && regval_size(guid_val) == sizeof(struct uuid)) - memcpy(guid, regval_data_p(guid_val), sizeof(struct uuid)); + if (guid && regval_size(guid_val) == sizeof(struct GUID)) + memcpy(guid, regval_data_p(guid_val), sizeof(struct GUID)); free_a_printer(&printer, 2); return True; @@ -3304,7 +3304,7 @@ WERROR check_published_printers(void) } BOOL is_printer_published(Printer_entry *print_hnd, int snum, - struct uuid *guid) + struct GUID *guid) { return False; } |