From 7133c7fc7f6dc561ad59d62a604b20316cb45e24 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Feb 05 2019 21:42:36 +0000
Subject: Remove macro ZERO_STRUCT


It was used just on few places and we directly call memset on many
other places

[~/sssd]$ git grep memset | grep sizeof | wc -l
97

Merges: https://pagure.io/SSSD/sssd/pull-request/3941

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>

---

diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c
index df0fb83..03bc25f 100644
--- a/src/db/sysdb_ops.c
+++ b/src/db/sysdb_ops.c
@@ -3840,7 +3840,7 @@ int sysdb_search_ts_users(TALLOC_CTX *mem_ctx,
         return EINVAL;
     }
 
-    ZERO_STRUCT(*res);
+    memset(res, 0, sizeof(*res));
 
     if (domain->sysdb->ldb_ts == NULL) {
         return ERR_NO_TS;
@@ -4121,7 +4121,7 @@ int sysdb_search_ts_groups(TALLOC_CTX *mem_ctx,
         return EINVAL;
     }
 
-    ZERO_STRUCT(*res);
+    memset(res, 0, sizeof(*res));
 
     if (domain->sysdb->ldb_ts == NULL) {
         return ERR_NO_TS;
diff --git a/src/providers/ad/ad_gpo_ndr.c b/src/providers/ad/ad_gpo_ndr.c
index 884ab76..84ad75b 100644
--- a/src/providers/ad/ad_gpo_ndr.c
+++ b/src/providers/ad/ad_gpo_ndr.c
@@ -262,7 +262,7 @@ ndr_pull_dom_sid(struct ndr_pull *ndr,
             return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
         }
         NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->id_auth, 6));
-        ZERO_STRUCT(r->sub_auths);
+        memset(&r->sub_auths, 0, sizeof(r->sub_auths));
         for (cntr_sub_auths_0 = 0;
              cntr_sub_auths_0 < r->num_auths;
              cntr_sub_auths_0++) {
diff --git a/src/providers/ipa/ipa_s2n_exop.c b/src/providers/ipa/ipa_s2n_exop.c
index 6f39746..f1626ed 100644
--- a/src/providers/ipa/ipa_s2n_exop.c
+++ b/src/providers/ipa/ipa_s2n_exop.c
@@ -2243,7 +2243,7 @@ static errno_t ipa_s2n_save_objects(struct sss_domain_info *dom,
             type = SYSDB_MEMBER_USER;
             if (dom->subdomain_homedir
                     && attrs->a.user.pw_dir == NULL) {
-                ZERO_STRUCT(homedir_ctx);
+                memset(&homedir_ctx, 0, sizeof(homedir_ctx));
                 homedir_ctx.username = attrs->a.user.pw_name;
                 homedir_ctx.uid = attrs->a.user.pw_uid;
                 homedir_ctx.domain = dom->name;
diff --git a/src/providers/ipa/ipa_subdomains_id.c b/src/providers/ipa/ipa_subdomains_id.c
index 9958d9d..5b975a5 100644
--- a/src/providers/ipa/ipa_subdomains_id.c
+++ b/src/providers/ipa/ipa_subdomains_id.c
@@ -901,7 +901,7 @@ get_subdomain_homedir_of_user(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom,
         goto done;
     }
 
-    ZERO_STRUCT(homedir_ctx);
+    memset(&homedir_ctx, 0, sizeof(homedir_ctx));
 
     homedir_ctx.uid = uid;
     homedir_ctx.username = fqname;
diff --git a/src/util/signal.c b/src/util/signal.c
index 93fd340..d77b79d 100644
--- a/src/util/signal.c
+++ b/src/util/signal.c
@@ -68,7 +68,7 @@ void (*CatchSignal(int signum,void (*handler)(int )))(int)
 	struct sigaction act;
 	struct sigaction oldact;
 
-	ZERO_STRUCT(act);
+	memset(&act, 0, sizeof(act));
 
 	act.sa_handler = handler;
 #ifdef SA_RESTART
diff --git a/src/util/util.h b/src/util/util.h
index 7e9b3d6..dbb1b00 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -66,8 +66,6 @@
 #define NULL 0
 #endif
 
-#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
-
 #define SSSD_MAIN_OPTS SSSD_DEBUG_OPTS
 
 #define SSSD_SERVER_OPTS(uid, gid) \
diff --git a/src/util/util_watchdog.c b/src/util/util_watchdog.c
index 20a8b89..a07275b 100644
--- a/src/util/util_watchdog.c
+++ b/src/util/util_watchdog.c
@@ -174,7 +174,7 @@ int setup_watchdog(struct tevent_context *ev, int interval)
     int signum = SIGRTMIN;
     int ret;
 
-    ZERO_STRUCT(sev);
+    memset(&sev, 0, sizeof(sev));
     CatchSignal(signum, watchdog_handler);
 
     sev.sigev_notify = SIGEV_SIGNAL;