1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
Description: libvolmgt is a stub, it does nothing.
Obviously this file should be rewritten or removed,
but I can just cutoff libvolmgt.
Index: cdrkit/libusal/scsi-sun.c
===================================================================
--- cdrkit.orig/libusal/scsi-sun.c 2012-12-31 20:14:48.343051065 +0400
+++ cdrkit/libusal/scsi-sun.c 2012-12-31 20:21:35.560310606 +0400
@@ -62,7 +62,6 @@
*/
#ifdef __SVR4
/*#define VOLMGT_DEBUG*/
-#include <volmgt.h>
#include <statdefs.h>
# define USE_USCSI
#endif
@@ -87,7 +86,7 @@
static int usalo_ureset(SCSI *usalp, int what);
static int usalo_usend(SCSI *usalp);
-static int have_volmgt = -1;
+static int have_volmgt = 0;
static usal_ops_t sun_uscsi_ops = {
usalo_usend,
@@ -455,9 +454,6 @@
register int nopen = 0;
char devname[32];
- if (have_volmgt < 0)
- have_volmgt = volmgt_running();
-
if (usalp->overbose) {
fprintf((FILE *)usalp->errfile,
"Warning: Using USCSI interface.\n");
@@ -637,9 +633,6 @@
* First try to translate between a symbolic name and a /dev/...
* based device name. Then translate back to a symbolic name.
*/
- symdev = volmgt_symdev(devname);
- if (symdev)
- name = volmgt_symname(symdev);
if (usalp->debug > 0) {
fprintf((FILE *)usalp->errfile,
"volmgt_symdev(%s)=%s -> %s\n", devname, symdev, name);
@@ -650,11 +643,6 @@
* a /dev/... based device name. Try to translate it into a
* symbolic name. Then translate back to a /dev/... name.
*/
- if (name == NULL) {
- name = volmgt_symname(devname);
- if (name)
- symdev = volmgt_symdev(name);
- }
if (usalp->debug > 0) {
fprintf((FILE *)usalp->errfile,
"volmgt_symdev(%s)=%s -> %s\n", devname, symdev, name);
@@ -677,7 +665,7 @@
*/
if (usalp->debug > 0) {
fprintf((FILE *)usalp->errfile,
- "volmgt_inuse(%s) %d\n", symdev, volmgt_inuse(symdev));
+ "volmgt_inuse(%s) %d\n", symdev, 0);
}
if (mname)
f = usalo_openmedia(usalp, mname);
|
