diff options
Diffstat (limited to 'src/sg_read_buffer.c')
| -rw-r--r-- | src/sg_read_buffer.c | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/src/sg_read_buffer.c b/src/sg_read_buffer.c index aefc3b3a..2fa580ce 100644 --- a/src/sg_read_buffer.c +++ b/src/sg_read_buffer.c @@ -1,30 +1,8 @@ /* - * Copyright (c) 2006-2008 Luben Tuikov and Douglas Gilbert. + * Copyright (c) 2006-2010 Luben Tuikov and Douglas Gilbert. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * + * Use of this source code is governed by a BSD-style + * license that can be found in the BSD_LICENSE file. */ #include <unistd.h> @@ -46,9 +24,7 @@ * This utility issues the SCSI READ BUFFER command to the given device. */ -static char * version_str = "1.05 20080510"; - -#define ME "sg_read_buffer: " +static char * version_str = "1.05 20100312"; static struct option long_options[] = { @@ -223,7 +199,7 @@ main(int argc, char * argv[]) ++verbose; break; case 'V': - fprintf(stderr, ME "version: %s\n", version_str); + fprintf(stderr, "version: %s\n", version_str); return 0; default: fprintf(stderr, "unrecognised option code 0x%x ??\n", c); @@ -280,7 +256,7 @@ main(int argc, char * argv[]) sg_fd = sg_cmds_open_device(device_name, 0 /* rw */, verbose); if (sg_fd < 0) { - fprintf(stderr, ME "open error: %s: %s\n", device_name, + fprintf(stderr, "open error: %s: %s\n", device_name, safe_strerror(-sg_fd)); return SG_LIB_FILE_ERROR; } |