[PATCH 2/6] s3-spoolss: Pull printer URI from CUPS and add support for URIs to printer_list

[David Disseldorp]

On Wed, 31 Aug 2011 15:03:10 -0400
Justin Chevrier <jchevrier at gmail.com> wrote:

> diff --git a/source3/printing/pcap.h b/source3/printing/pcap.h
> index 7056213..6a7cce8 100644
> --- a/source3/printing/pcap.h
> +++ b/source3/printing/pcap.h
> @@ -33,13 +33,13 @@ struct pcap_cache;
>  
>  /* The following definitions come from printing/pcap.c  */
>  
> -bool pcap_cache_add_specific(struct pcap_cache **ppcache, const char *name, const char *comment, const char *location);
> +bool pcap_cache_add_specific(struct pcap_cache **ppcache, const char *name, const char *comment, const char *location, const char *uri);
>  void pcap_cache_destroy_specific(struct pcap_cache **ppcache);
> -bool pcap_cache_add(const char *name, const char *comment, const char *location);
> +bool pcap_cache_add(const char *name, const char *comment, const char *location, const char *uri);
>  bool pcap_cache_loaded(void);
>  bool pcap_cache_replace(const struct pcap_cache *cache);
> -void pcap_printer_fn_specific(const struct pcap_cache *, void (*fn)(const char *, const char *, const char *, void *), void *);
> -void pcap_printer_fn(void (*fn)(const char *, const char *, const char *, void *), void *);
> +void pcap_printer_fn_specific(const struct pcap_cache *, void (*fn)(const char *, const char *, const char *, const char *, void *), void *);
> +void pcap_printer_fn(void (*fn)(const char *, const char *, const char *, const char *, void *), void *);

As the arg lists grow here, perhaps it's worth looking at changing to a
single struct pcap_printer arg, same goes for the printer_list fns.
Anyhow, I'm fine with this as is for now.