Skip to content

Commit

Permalink
lib/sg_pt_solaris.c : fix compilation issue per #41
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@1050 6180dd3e-e324-4e3e-922d-17de1ae2f315
  • Loading branch information
doug-gilbert committed Sep 15, 2023
1 parent 7cf5d40 commit 9b017c5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 11 deletions.
4 changes: 3 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ Each utility has its own version number, date of last change and
some description at the top of its ".c" file. All utilities in the main
directory have their own "man" pages. There is also a sg3_utils man page.

Changelog for pre-release sg3_utils-1.49 [20230905] [svn: r1049]
Changelog for pre-release sg3_utils-1.49 [20230914] [svn: r1050]
- apply https://github.com/doug-gilbert/sg3_utils/pull/39
and its revision [20230807] mainly for Android
- sg_inq: update version descriptors to T10 table 20230814
- sg_wr_mode: fix --contents and --cfile= handling
https://github.com/doug-gilbert/sg3_utils/issues/40
- lib/sg_pt_solaris.c : fix compilation issue per
https://github.com/doug-gilbert/sg3_utils/pull/41
- add --mfile=MF option for decoding mask in the MF file
- testing/sg_chk_inq_vd.c: test internal table against T10
version descriptor file
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sg3-utils (1.49-0.1) unstable; urgency=low

* New upstream version

-- Douglas Gilbert <[email protected]> Tue, 05 Sep 2023 19:00:00 -0400
-- Douglas Gilbert <[email protected]> Thu, 14 Sep 2023 21:00:00 -0400

sg3-utils (1.48-0.1) unstable; urgency=low

Expand Down
6 changes: 4 additions & 2 deletions doc/sg_format.8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH SG_FORMAT "8" "May 2023" "sg3_utils\-1.48" SG3_UTILS
.TH SG_FORMAT "8" "September 2023" "sg3_utils\-1.49" SG3_UTILS
.SH NAME
sg_format \- format, format with preset, resize SCSI disk; format tape
.SH SYNOPSIS
Expand Down Expand Up @@ -357,7 +357,9 @@ long option form is \fI\-\-tmo=SECS\fR.
.TP
\fB\-v\fR, \fB\-\-verbose\fR
increase the level of verbosity, (i.e. debug output). "\-vvv" gives
a lot more debug output.
a lot more debug output. For example giving the option once will show
the SCSI commands (CDBs) issued. Giving this option multiple times will
additionally show the data buffers (metadata) sent and received.
.TP
\fB\-y\fR, \fB\-\-verify\fR
set the VERIFY bit in the FORMAT MEDIUM cdb. The default is that the VERIFY
Expand Down
Binary file modified inhex/vpd_zbdc.raw
Binary file not shown.
8 changes: 4 additions & 4 deletions lib/sg_pt_solaris.c
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*
* Copyright (c) 2007-2021 Douglas Gilbert.
* Copyright (c) 2007-2023 Douglas Gilbert.
* All rights reserved.
* Use of this source code is governed by a BSD-style
* license that can be found in the BSD_LICENSE file.
*
* SPDX-License-Identifier: BSD-2-Clause
*/

/* sg_pt_solaris version 1.15 20210617 */
/* sg_pt_solaris version 1.16 20230914 */

#include <stdio.h>
#include <stdlib.h>
Expand All @@ -32,7 +32,7 @@

#include "sg_pt.h"
#include "sg_lib.h"

#include "sg_pr2serr.h"

#define DEF_TIMEOUT 60 /* 60 seconds */

Expand Down Expand Up @@ -543,7 +543,7 @@ check_pt_file_handle(int device_fd, const char * device_name, int vb)
* if there is no valid file handle. */
int
get_pt_file_handle(const struct sg_pt_base * vp)
{
{
const struct sg_pt_solaris_scsi * ptp = &vp->impl;

return ptp->dev_fd;
Expand Down
2 changes: 1 addition & 1 deletion sg3_utils.spec
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ fi
%{_libdir}/*.a

%changelog
* Tue Sep 05 2023 - dgilbert at interlog dot com
* Thu Sep 14 2023 - dgilbert at interlog dot com
- track t10 changes
* sg3_utils-1.49

Expand Down
5 changes: 3 additions & 2 deletions src/sg_format.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "sg_pr2serr.h"
#include "sg_pt.h"

static const char * version_str = "1.73 20230618";
static const char * version_str = "1.74 20230914";


#define MY_NAME "sg_format"
Expand Down Expand Up @@ -251,7 +251,8 @@ usage()
" to FM (def: 0 --> default format)\n"
" --timeout=SECS|-m SECS FORMAT UNIT/MEDIUM command "
"timeout in seconds\n"
" --verbose|-v increase verbosity\n"
" --verbose|-v increase verbosity, can use multiple "
"times\n"
" --verify|-y sets VERIFY bit in FORMAT MEDIUM (tape)\n"
" --version|-V print version details and exit\n"
" --wait|-w format commands wait until format "
Expand Down

0 comments on commit 9b017c5

Please sign in to comment.