diff options
| author | Toomas Soome <tsoome@me.com> | 2020-05-21 14:01:28 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2021-03-12 08:51:22 +0200 |
| commit | 3a4671b6f0da381fd0891bf9fe1fcb82176d9897 (patch) | |
| tree | d04a7c731a993cc51b001fc374fe6f6d923de95f | |
| parent | 9c508120caba0f594e67ae6e1f0ca8a7e3a274e5 (diff) | |
| download | illumos-joyent-3a4671b6f0da381fd0891bf9fe1fcb82176d9897.tar.gz | |
13524 cdrw: multiply-defined symbols
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/cmd/cdrw/mmc.c | 12 | ||||
| -rw-r--r-- | usr/src/cmd/cdrw/mmc.h | 6 | ||||
| -rw-r--r-- | usr/src/cmd/cdrw/transport.h | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/usr/src/cmd/cdrw/mmc.c b/usr/src/cmd/cdrw/mmc.c index d52e4ba194..4b90cc5f3d 100644 --- a/usr/src/cmd/cdrw/mmc.c +++ b/usr/src/cmd/cdrw/mmc.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <stdlib.h> #include <stdio.h> @@ -35,6 +33,8 @@ #include "util.h" #include "main.h" +int uscsi_error; + int test_unit_ready(int fd) { @@ -278,7 +278,7 @@ get_configuration(int fd, uint16_t feature, int bufsize, uchar_t *buf) int read10(int fd, uint32_t start_blk, uint16_t nblk, uchar_t *buf, - uint32_t bufsize) + uint32_t bufsize) { struct uscsi_cmd *scmd; @@ -299,7 +299,7 @@ read10(int fd, uint32_t start_blk, uint16_t nblk, uchar_t *buf, int write10(int fd, uint32_t start_blk, uint16_t nblk, uchar_t *buf, - uint32_t bufsize) + uint32_t bufsize) { struct uscsi_cmd *scmd; @@ -396,7 +396,7 @@ blank_disc(int fd, int type, int immediate) int read_cd(int fd, uint32_t start_blk, uint16_t nblk, uchar_t sector_type, - uchar_t *buf, uint32_t bufsize) + uchar_t *buf, uint32_t bufsize) { struct uscsi_cmd *scmd; @@ -891,7 +891,7 @@ print_profile_name(uint16_t num, uchar_t current, uchar_t abbr) * * Description: Print a list of Profiles supported by the Logical Unit. * - * Parameters: fd - file descriptor for device whose list of + * Parameters: fd - file descriptor for device whose list of * profiles we wish to print */ void diff --git a/usr/src/cmd/cdrw/mmc.h b/usr/src/cmd/cdrw/mmc.h index ec92b48b72..c48062a83c 100644 --- a/usr/src/cmd/cdrw/mmc.h +++ b/usr/src/cmd/cdrw/mmc.h @@ -26,8 +26,6 @@ #ifndef _MMC_H #define _MMC_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -156,9 +154,9 @@ int format_media(int fd); uint32_t read_format_capacity(int fd, uint_t *bsize); void reset_dev(int fd); -int uscsi_error; /* used for debugging failed uscsi */ +extern int uscsi_error; /* used for debugging failed uscsi */ -#define REZERO_UNIT_CMD 0x01 +#define REZERO_UNIT_CMD 0x01 #define FORMAT_UNIT_CMD 0x04 #define INQUIRY_CMD 0x12 #define MODE_SELECT_6_CMD 0x15 diff --git a/usr/src/cmd/cdrw/transport.h b/usr/src/cmd/cdrw/transport.h index 373b6b916a..b3ba7d38d4 100644 --- a/usr/src/cmd/cdrw/transport.h +++ b/usr/src/cmd/cdrw/transport.h @@ -27,8 +27,6 @@ #ifndef _TRANSPORT_H #define _TRANSPORT_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -42,7 +40,7 @@ extern "C" { #define RQBUFLEN 32 extern char rqbuf[RQBUFLEN]; -uchar_t uscsi_status, rqstatus, rqresid; +extern uchar_t uscsi_status, rqstatus, rqresid; struct uscsi_cmd *get_uscsi_cmd(void); int uscsi(int fd, struct uscsi_cmd *scmd); |