URL:
https://github.com/SSSD/sssd/pull/902
Title: #902: Added ERROR and PRINT macros to the tools
mzidek-rh commented:
"""
@alexal There are some coding style issues, see the following patch (you can merge this
patch with your patch):
```
From 754ca3888070b63cad5d79fab021c652ac57ff2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek(a)redhat.com>
Date: Wed, 16 Oct 2019 17:28:32 +0200
Subject: [PATCH] Coding style issues
Merge this patch with the main patch
---
src/tools/sss_groupshow.c | 4 ++--
src/tools/sss_override.c | 8 ++++----
src/tools/sss_seed.c | 2 +-
src/tools/sssctl/sssctl_cache.c | 4 ++--
src/tools/sssctl/sssctl_data.c | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/tools/sss_groupshow.c b/src/tools/sss_groupshow.c
index c932b5958..7b0fbe117 100644
--- a/src/tools/sss_groupshow.c
+++ b/src/tools/sss_groupshow.c
@@ -613,8 +613,8 @@ static void print_group_info(struct group_info *g, unsigned level)
snprintf(padding, 512, fmt, "");
PRINT("%1$s%2$sGroup: %3$s\n", padding,
- g->mpg ? _("Magic Private ") :
"",
- g->name);
+ g->mpg ? _("Magic Private ") : "",
+ g->name);
PRINT("%1$sGID number: %2$d\n", padding, g->gid);
PRINT("%1$sMember users: ", padding);
diff --git a/src/tools/sss_override.c b/src/tools/sss_override.c
index 866ad7f77..9b408a353 100644
--- a/src/tools/sss_override.c
+++ b/src/tools/sss_override.c
@@ -268,10 +268,10 @@ errno_t prepare_view_msg(struct sss_domain_info *domain)
ret = prepare_view(domain);
if (ret == EEXIST) {
ERROR("Other than " LOCALVIEW " view already exists "
- "in domain %s.\n", domain->name);
+ "in domain %s.\n", domain->name);
} else if (ret != EOK) {
ERROR("Unable to prepare " LOCALVIEW
- " view in domain %s.\n", domain->name);
+ " view in domain %s.\n", domain->name);
}
return ret;
@@ -1292,7 +1292,7 @@ static errno_t user_export(const char *filename,
db = sss_colondb_open(tmp_ctx, SSS_COLONDB_WRITE, filename);
if (db == NULL) {
ERROR("Unable to open %s.\n",
- filename == NULL ? "stdout" : filename);
+ filename == NULL ? "stdout" : filename);
ret = EIO;
goto done;
}
@@ -1362,7 +1362,7 @@ static errno_t group_export(const char *filename,
db = sss_colondb_open(tmp_ctx, SSS_COLONDB_WRITE, filename);
if (db == NULL) {
ERROR("Unable to open %s.\n",
- filename == NULL ? "stdout" : filename);
+ filename == NULL ? "stdout" : filename);
ret = EIO;
goto done;
}
diff --git a/src/tools/sss_seed.c b/src/tools/sss_seed.c
index 8693d86a3..91bfb4cf8 100644
--- a/src/tools/sss_seed.c
+++ b/src/tools/sss_seed.c
@@ -874,7 +874,7 @@ int main(int argc, const char **argv)
PRINT("User cache entry created for %1$s\n",
sctx->uctx->name);
}
PRINT("Temporary password added to cache entry for %1$s\n",
- sctx->uctx->name);
+ sctx->uctx->name);
}
done:
diff --git a/src/tools/sssctl/sssctl_cache.c b/src/tools/sssctl/sssctl_cache.c
index 3932dc758..421e817b1 100644
--- a/src/tools/sssctl/sssctl_cache.c
+++ b/src/tools/sssctl/sssctl_cache.c
@@ -520,7 +520,7 @@ static errno_t sssctl_print_object(struct sssctl_object_info *info,
goto done;
} else if (ret != EOK) {
ERROR("Error: Unable to get object [%d]: %s\n",
- ret, sss_strerror(ret));
+ ret, sss_strerror(ret));
goto done;
}
@@ -536,7 +536,7 @@ static errno_t sssctl_print_object(struct sssctl_object_info *info,
continue;
} else if (ret != EOK) {
ERROR("%s: Unable to read value [%d]: %s\n",
- info[i].msg, ret, sss_strerror(ret));
+ info[i].msg, ret, sss_strerror(ret));
continue;
}
diff --git a/src/tools/sssctl/sssctl_data.c b/src/tools/sssctl/sssctl_data.c
index 733037fbb..8d79b977f 100644
--- a/src/tools/sssctl/sssctl_data.c
+++ b/src/tools/sssctl/sssctl_data.c
@@ -87,7 +87,7 @@ static errno_t sssctl_backup(bool force)
ret = sssctl_create_backup_dir(SSS_BACKUP_DIR);
if (ret != EOK) {
ERROR("Unable to create backup directory [%d]: %s",
- ret, sss_strerror(ret));
+ ret, sss_strerror(ret));
return ret;
}
--
2.20.1
```
"""
See the full comment at
https://github.com/SSSD/sssd/pull/902#issuecomment-542761421