diff options
| author | Günther Deschner <gd@samba.org> | 2009-02-08 19:24:39 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-02-09 10:42:46 +0100 |
| commit | 894d05bc41c683a47590cd237194e2b3b7ec0e67 (patch) | |
| tree | 21da7625297f086c93dbd74cded6b5494b78421e /source3 | |
| parent | c0e3b195c86edc7fc9a862006e258e517465b7fd (diff) | |
| download | samba-894d05bc41c683a47590cd237194e2b3b7ec0e67.tar.gz samba-894d05bc41c683a47590cd237194e2b3b7ec0e67.tar.bz2 samba-894d05bc41c683a47590cd237194e2b3b7ec0e67.zip | |
s3-spoolss: restore delete_a_form().
Guenther
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/printing/nt_printing.c | 11 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index f36e538485..aa5314579a 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4792,8 +4792,7 @@ bool get_a_builtin_ntform_by_string(const char *form_name, nt_forms_struct *form int get_ntforms(nt_forms_struct **list); int write_ntforms(nt_forms_struct **list, int number); bool add_a_form(nt_forms_struct **list, struct spoolss_AddFormInfo1 *form, int *count); -bool delete_a_form(nt_forms_struct **list, UNISTR2 *del_name, int *count, WERROR *ret); -bool delete_a_form_by_string(nt_forms_struct **list, const char *del_name, int *count, WERROR *ret); +bool delete_a_form(nt_forms_struct **list, const char *del_name, int *count, WERROR *ret); void update_a_form(nt_forms_struct **list, struct spoolss_AddFormInfo1 *form, int count); int get_ntdrivers(fstring **list, const char *architecture, uint32 version); const char *get_short_archi(const char *long_archi); diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 97e7180cd9..0ed32d981b 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -940,7 +940,7 @@ bool add_a_form(nt_forms_struct **list, struct spoolss_AddFormInfo1 *form, int * Delete a named form struct. ****************************************************************************/ -bool delete_a_form_by_string(nt_forms_struct **list, const char *del_name, int *count, WERROR *ret) +bool delete_a_form(nt_forms_struct **list, const char *del_name, int *count, WERROR *ret) { char *key = NULL; int n=0; @@ -973,15 +973,6 @@ bool delete_a_form_by_string(nt_forms_struct **list, const char *del_name, int * return true; } -bool delete_a_form(nt_forms_struct **list, UNISTR2 *del_name, int *count, WERROR *ret) -{ - fstring form_name; - - unistr2_to_ascii(form_name, del_name, sizeof(form_name)); - - return delete_a_form_by_string(list, form_name, count, ret); -} - /**************************************************************************** Update a form struct. ****************************************************************************/ diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 3d9d00be2d..f7d421263c 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -8580,7 +8580,7 @@ WERROR _spoolss_DeleteForm(pipes_struct *p, count = get_ntforms(&list); - if ( !delete_a_form_by_string(&list, form_name, &count, &status )) + if ( !delete_a_form(&list, form_name, &count, &status )) goto done; /* |