diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-07-22 21:12:25 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-07-22 21:12:25 +0000 |
| commit | 54d08ad20ccf0d4b34df080541916b302c49257f (patch) | |
| tree | 12be1ed1fccff4bc6b4875fab515db47ab6ffd97 /libgphoto2_port/serial | |
| parent | 03710f7ef9c34585d447e5c915dbc77bf8fbd681 (diff) | |
| download | libgphoto2-54d08ad20ccf0d4b34df080541916b302c49257f.tar.gz | |
From: Axel Waggershauser <awagger@web.de>
here are the logging cleanup patches for the remaining libgphoto_port
backend libs, that I announced earlier.
14 and 15 are equivalent to 3,4,5 as before.
16 removes 4 left instances of _(...) macro usage in log messages.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15106 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/serial')
| -rw-r--r-- | libgphoto2_port/serial/unix.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c index 4666ed7ab..44962f0c7 100644 --- a/libgphoto2_port/serial/unix.c +++ b/libgphoto2_port/serial/unix.c @@ -218,8 +218,7 @@ gp_port_serial_lock (GPPort *dev, const char *path) int pid; #endif - gp_log (GP_LOG_DEBUG, "gphoto2-port-serial", - "Trying to lock '%s'...", path); + GP_LOG_D ("Trying to lock '%s'...", path); #if defined(HAVE_TTYLOCK) if (ttylock ((char*) path)) { @@ -395,7 +394,7 @@ gp_port_serial_open (GPPort *dev) if (result < GP_OK) return result; result = gp_port_info_get_path (info, &port); if (result < GP_OK) return result; - gp_log (GP_LOG_DEBUG, "gp_port_serial_open", "opening %s", port); + GP_LOG_D ("opening %s", port); /* Ports are named "serial:/dev/whatever/port" */ port = strchr (port, ':'); @@ -409,8 +408,7 @@ gp_port_serial_open (GPPort *dev) result = gp_port_serial_lock (dev, port); if (result == GP_OK) break; - gp_log (GP_LOG_DEBUG, "gphoto2-port-serial", - "Failed to get a lock, trying again..."); + GP_LOG_D ("Failed to get a lock, trying again..."); sleep (1); } CHECK (result); @@ -775,8 +773,7 @@ gp_port_serial_baudconv (int baudrate) #endif default: ret = (speed_t) baudrate; - gp_log (GP_LOG_DEBUG, "gphoto2-port-serial", "Baudrate %d " - "unknown - using as is", baudrate); + GP_LOG_D ("Baudrate %d unknown - using as is", baudrate); } return ret; @@ -809,8 +806,7 @@ gp_port_serial_check_speed (GPPort *dev) if (dev->pl->baudrate == dev->settings.serial.speed) return (GP_OK); - gp_log (GP_LOG_DEBUG, "gphoto2-port-serial", - "Setting baudrate to %d...", dev->settings.serial.speed); + GP_LOG_D ("Setting baudrate to %d...", dev->settings.serial.speed); speed = gp_port_serial_baudconv (dev->settings.serial.speed); #ifdef OS2 |