Fix vet warning in devicemapper.
| ... | ... |
@@ -8,6 +8,7 @@ import ( |
| 8 | 8 |
"os" |
| 9 | 9 |
"runtime" |
| 10 | 10 |
"syscall" |
| 11 |
+ "unsafe" |
|
| 11 | 12 |
|
| 12 | 13 |
"github.com/Sirupsen/logrus" |
| 13 | 14 |
) |
| ... | ... |
@@ -226,7 +227,7 @@ func (t *Task) GetDriverVersion() (string, error) {
|
| 226 | 226 |
return res, nil |
| 227 | 227 |
} |
| 228 | 228 |
|
| 229 |
-func (t *Task) GetNextTarget(next uintptr) (nextPtr uintptr, start uint64, |
|
| 229 |
+func (t *Task) GetNextTarget(next unsafe.Pointer) (nextPtr unsafe.Pointer, start uint64, |
|
| 230 | 230 |
length uint64, targetType string, params string) {
|
| 231 | 231 |
|
| 232 | 232 |
return DmGetNextTarget(t.unmanaged, next, &start, &length, |
| ... | ... |
@@ -512,7 +513,7 @@ func GetStatus(name string) (uint64, uint64, string, string, error) {
|
| 512 | 512 |
return 0, 0, "", "", fmt.Errorf("Non existing device %s", name)
|
| 513 | 513 |
} |
| 514 | 514 |
|
| 515 |
- _, start, length, targetType, params := task.GetNextTarget(0) |
|
| 515 |
+ _, start, length, targetType, params := task.GetNextTarget(unsafe.Pointer(nil)) |
|
| 516 | 516 |
return start, length, targetType, params, nil |
| 517 | 517 |
} |
| 518 | 518 |
|
| ... | ... |
@@ -219,7 +219,7 @@ func dmTaskGetDriverVersionFct(task *CDmTask) string {
|
| 219 | 219 |
return C.GoString((*C.char)(buffer)) |
| 220 | 220 |
} |
| 221 | 221 |
|
| 222 |
-func dmGetNextTargetFct(task *CDmTask, next uintptr, start, length *uint64, target, params *string) uintptr {
|
|
| 222 |
+func dmGetNextTargetFct(task *CDmTask, next unsafe.Pointer, start, length *uint64, target, params *string) unsafe.Pointer {
|
|
| 223 | 223 |
var ( |
| 224 | 224 |
Cstart, Clength C.uint64_t |
| 225 | 225 |
CtargetType, Cparams *C.char |
| ... | ... |
@@ -231,8 +231,8 @@ func dmGetNextTargetFct(task *CDmTask, next uintptr, start, length *uint64, targ |
| 231 | 231 |
*params = C.GoString(Cparams) |
| 232 | 232 |
}() |
| 233 | 233 |
|
| 234 |
- nextp := C.dm_get_next_target((*C.struct_dm_task)(task), unsafe.Pointer(next), &Cstart, &Clength, &CtargetType, &Cparams) |
|
| 235 |
- return uintptr(nextp) |
|
| 234 |
+ nextp := C.dm_get_next_target((*C.struct_dm_task)(task), next, &Cstart, &Clength, &CtargetType, &Cparams) |
|
| 235 |
+ return nextp |
|
| 236 | 236 |
} |
| 237 | 237 |
|
| 238 | 238 |
func dmUdevSetSyncSupportFct(syncWithUdev int) {
|