diff options
| author | Volker Lendecke <vl@samba.org> | 2010-06-13 12:07:37 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-06-13 12:40:27 +0200 |
| commit | 1b13755698464581fb1b4a3083f5930d7b408ea4 (patch) | |
| tree | 64ba00accbfff14f8837d16f7f0b51c2dcf23cf4 | |
| parent | 731b4469cb3b074a39b21fee220517af3df26a68 (diff) | |
| download | samba-1b13755698464581fb1b4a3083f5930d7b408ea4.tar.gz samba-1b13755698464581fb1b4a3083f5930d7b408ea4.tar.bz2 samba-1b13755698464581fb1b4a3083f5930d7b408ea4.zip | |
s3: Remove the pointless SERVICE macro
| -rw-r--r-- | source3/include/smb_macros.h | 1 | ||||
| -rw-r--r-- | source3/printing/notify.c | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index bc5d9a7fe1..f9a58f33be 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -68,7 +68,6 @@ /* access various service details */ -#define SERVICE(snum) (lp_servicename(snum)) #define PRINTERNAME(snum) (lp_printername(snum)) #define CAN_WRITE(conn) (!conn->read_only) #define VALID_SNUM(snum) (lp_snum_ok(snum)) diff --git a/source3/printing/notify.c b/source3/printing/notify.c index a18b2fd897..1d155bb3a4 100644 --- a/source3/printing/notify.c +++ b/source3/printing/notify.c @@ -407,7 +407,7 @@ void notify_printer_status_byname(const char *sharename, uint32 status) void notify_printer_status(int snum, uint32 status) { - const char *sharename = SERVICE(snum); + const char *sharename = lp_servicename(snum); if (sharename) notify_printer_status_byname(sharename, status); @@ -472,7 +472,7 @@ void notify_job_submitted(const char *sharename, uint32 jobid, void notify_printer_driver(int snum, const char *driver_name) { - const char *sharename = SERVICE(snum); + const char *sharename = lp_servicename(snum); send_notify_field_buffer( sharename, PRINTER_NOTIFY_TYPE, PRINTER_NOTIFY_FIELD_DRIVER_NAME, @@ -481,7 +481,7 @@ void notify_printer_driver(int snum, const char *driver_name) void notify_printer_comment(int snum, const char *comment) { - const char *sharename = SERVICE(snum); + const char *sharename = lp_servicename(snum); send_notify_field_buffer( sharename, PRINTER_NOTIFY_TYPE, PRINTER_NOTIFY_FIELD_COMMENT, @@ -490,7 +490,7 @@ void notify_printer_comment(int snum, const char *comment) void notify_printer_sharename(int snum, const char *share_name) { - const char *sharename = SERVICE(snum); + const char *sharename = lp_servicename(snum); send_notify_field_buffer( sharename, PRINTER_NOTIFY_TYPE, PRINTER_NOTIFY_FIELD_SHARE_NAME, @@ -499,7 +499,7 @@ void notify_printer_sharename(int snum, const char *share_name) void notify_printer_printername(int snum, const char *printername) { - const char *sharename = SERVICE(snum); + const char *sharename = lp_servicename(snum); send_notify_field_buffer( sharename, PRINTER_NOTIFY_TYPE, PRINTER_NOTIFY_FIELD_PRINTER_NAME, @@ -508,7 +508,7 @@ void notify_printer_printername(int snum, const char *printername) void notify_printer_port(int snum, const char *port_name) { - const char *sharename = SERVICE(snum); + const char *sharename = lp_servicename(snum); send_notify_field_buffer( sharename, PRINTER_NOTIFY_TYPE, PRINTER_NOTIFY_FIELD_PORT_NAME, @@ -517,7 +517,7 @@ void notify_printer_port(int snum, const char *port_name) void notify_printer_location(int snum, const char *location) { - const char *sharename = SERVICE(snum); + const char *sharename = lp_servicename(snum); send_notify_field_buffer( sharename, PRINTER_NOTIFY_TYPE, PRINTER_NOTIFY_FIELD_LOCATION, |