diff options
| author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2014-02-12 10:12:04 -0500 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-02-12 22:30:55 +0100 |
| commit | a3c8390d19593b1e5277d95bfb4ab206d4785150 (patch) | |
| tree | 2eb4e5432f4f79a75589c03b1513b656879ebf9c /src/util/backup_file.c | |
| parent | cc026fd9ba386f2197e3217940d597dcad1a26fe (diff) | |
| download | sssd-a3c8390d19593b1e5277d95bfb4ab206d4785150.tar.gz sssd-a3c8390d19593b1e5277d95bfb4ab206d4785150.tar.xz sssd-a3c8390d19593b1e5277d95bfb4ab206d4785150.zip | |
Make DEBUG macro invocations variadic
Use a script to update DEBUG macro invocations to use it as a variadic
macro, supplying format string and its arguments directly, instead of
wrapping them in parens.
This script was used to update the code:
grep -rwl --include '*.[hc]' DEBUG . |
while read f; do
mv "$f"{,.orig}
perl -e \
'use strict;
use File::Slurp;
my $text=read_file(\*STDIN);
$text=~s#(\bDEBUG\s*\([^(]+)\((.*?)\)\s*\)\s*;#$1$2);#gs;
print $text;' < "$f.orig" > "$f"
rm "$f.orig"
done
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'src/util/backup_file.c')
| -rw-r--r-- | src/util/backup_file.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/util/backup_file.c b/src/util/backup_file.c index 316c1cfe8..a164a86cf 100644 --- a/src/util/backup_file.c +++ b/src/util/backup_file.c @@ -40,8 +40,8 @@ int backup_file(const char *src_file, int dbglvl) src_fd = open(src_file, O_RDONLY); if (src_fd < 0) { ret = errno; - DEBUG(dbglvl, ("Error (%d [%s]) opening source file %s\n", - ret, strerror(ret), src_file)); + DEBUG(dbglvl, "Error (%d [%s]) opening source file %s\n", + ret, strerror(ret), src_file); goto done; } @@ -70,14 +70,14 @@ int backup_file(const char *src_file, int dbglvl) if (dst_fd >= 0) break; if (ret != EEXIST) { - DEBUG(dbglvl, ("Error (%d [%s]) opening destination file %s\n", - ret, strerror(ret), dst_file)); + DEBUG(dbglvl, "Error (%d [%s]) opening destination file %s\n", + ret, strerror(ret), dst_file); goto done; } } if (ret != 0) { - DEBUG(dbglvl, ("Error (%d [%s]) opening destination file %s\n", - ret, strerror(ret), dst_file)); + DEBUG(dbglvl, "Error (%d [%s]) opening destination file %s\n", + ret, strerror(ret), dst_file); goto done; } @@ -87,8 +87,8 @@ int backup_file(const char *src_file, int dbglvl) numread = sss_atomic_read_s(src_fd, buf, BUFFER_SIZE); if (numread < 0) { ret = errno; - DEBUG(dbglvl, ("Error (%d [%s]) reading from source %s\n", - ret, strerror(ret), src_file)); + DEBUG(dbglvl, "Error (%d [%s]) reading from source %s\n", + ret, strerror(ret), src_file); goto done; } if (numread == 0) break; @@ -97,14 +97,14 @@ int backup_file(const char *src_file, int dbglvl) written = sss_atomic_write_s(dst_fd, buf, numread); if (written == -1) { ret = errno; - DEBUG(dbglvl, ("Error (%d [%s]) writing to destination %s\n", - ret, strerror(ret), dst_file)); + DEBUG(dbglvl, "Error (%d [%s]) writing to destination %s\n", + ret, strerror(ret), dst_file); goto done; } if (written != numread) { - DEBUG(dbglvl, ("Wrote %zd bytes expected %zd bytes\n", - written, numread)); + DEBUG(dbglvl, "Wrote %zd bytes expected %zd bytes\n", + written, numread); ret = EIO; goto done; } |