Browse code

devicemapper: actually remove DmLogInitVerbose

e07d3cd9a ("devmapper: Fix libdm logging") removed all of the callers of
DmLogInitVerbose, but we still kept around the wrapper. However, the
libdm dm_log_init_verbose API changes the verbosity of the *default*
libdm logger. Because pkg/devicemapper internally *relies* on using
logging callbacks to understand what errors were encountered by libdm,
this wrapper is useless (it only makes sense for the default logger
which we do not user).

Any user not inside Docker of this function almost certainly was not
using this API correctly, because pkg/devicemapper will misbehave if our
logging callbacks were not registered.

Signed-off-by: Aleksa Sarai <asarai@suse.de>

Aleksa Sarai authored on 2017/06/28 00:45:24
Showing 2 changed files
... ...
@@ -264,11 +264,6 @@ func UdevWait(cookie *uint) error {
264 264
 	return nil
265 265
 }
266 266
 
267
-// LogInitVerbose is an interface to initialize the verbose logger for the device mapper library.
268
-func LogInitVerbose(level int) {
269
-	DmLogInitVerbose(level)
270
-}
271
-
272 267
 var dmLogger DevmapperLogger
273 268
 
274 269
 // LogInit initializes the logger for the device mapper library.
... ...
@@ -58,7 +58,6 @@ const (
58 58
 var (
59 59
 	DmGetLibraryVersion       = dmGetLibraryVersionFct
60 60
 	DmGetNextTarget           = dmGetNextTargetFct
61
-	DmLogInitVerbose          = dmLogInitVerboseFct
62 61
 	DmSetDevDir               = dmSetDevDirFct
63 62
 	DmTaskAddTarget           = dmTaskAddTargetFct
64 63
 	DmTaskCreate              = dmTaskCreateFct
... ...
@@ -228,10 +227,6 @@ func dmCookieSupportedFct() int {
228 228
 	return int(C.dm_cookie_supported())
229 229
 }
230 230
 
231
-func dmLogInitVerboseFct(level int) {
232
-	C.dm_log_init_verbose(C.int(level))
233
-}
234
-
235 231
 func logWithErrnoInitFct() {
236 232
 	C.log_with_errno_init()
237 233
 }