From d01e7e0d36c28aeb5d9e45b8f083f830dd86d76e Mon Sep 17 00:00:00 2001 From: MIZUTA Takeshi Date: Thu, 14 Nov 2019 02:27:28 +0900 Subject: [PATCH] Don't use tabs for indentation The Coding guidelines include the following: https://docs.pagure.org/SSSD.sssd/developers/coding_style.html MUST: No tabs all indentation 4 spaces. However, there are places where tabs are used for indentation. Remove tabs indentation. --- src/db/sysdb.c | 8 ++-- src/providers/ldap/sdap_async.c | 8 ++-- src/providers/ldap/sdap_async.h | 14 +++--- src/responder/sudo/sudosrv_cmd.c | 2 +- src/sss_client/nfs/nfsidmap_internal.h | 30 ++++++------- src/sss_client/nss_group.c | 8 ++-- src/sss_client/nss_netgroup.c | 4 +- src/sss_client/nss_passwd.c | 8 ++-- src/sss_client/nss_services.c | 4 +- src/util/inotify.c | 2 +- src/util/signal.c | 60 +++++++++++++------------- 11 files changed, 74 insertions(+), 74 deletions(-) diff --git a/src/db/sysdb.c b/src/db/sysdb.c index f302a9ffef..5171a6f5c9 100644 --- a/src/db/sysdb.c +++ b/src/db/sysdb.c @@ -590,11 +590,11 @@ int sysdb_attrs_add_lower_case_string(struct sysdb_attrs *attrs, bool safe, int sysdb_attrs_add_mem(struct sysdb_attrs *attrs, const char *name, const void *mem, size_t size) { - struct ldb_val v; + struct ldb_val v; - v.data = discard_const(mem); - v.length = size; - return sysdb_attrs_add_val(attrs, name, &v); + v.data = discard_const(mem); + v.length = size; + return sysdb_attrs_add_val(attrs, name, &v); } int sysdb_attrs_add_base64_blob(struct sysdb_attrs *attrs, const char *name, diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c index 923723881a..854fa6b95a 100644 --- a/src/providers/ldap/sdap_async.c +++ b/src/providers/ldap/sdap_async.c @@ -2238,8 +2238,8 @@ struct sdap_sd_search_state { }; static int sdap_sd_search_create_control(struct sdap_handle *sh, - int val, - LDAPControl **ctrl); + int val, + LDAPControl **ctrl); static int sdap_sd_search_ctrls_destructor(void *ptr); static errno_t sdap_sd_search_parse_entry(struct sdap_handle *sh, struct sdap_msg *msg, @@ -2296,8 +2296,8 @@ sdap_sd_search_send(TALLOC_CTX *memctx, struct tevent_context *ev, } static int sdap_sd_search_create_control(struct sdap_handle *sh, - int val, - LDAPControl **ctrl) + int val, + LDAPControl **ctrl) { struct berval *sdval; int ret; diff --git a/src/providers/ldap/sdap_async.h b/src/providers/ldap/sdap_async.h index eebb01c118..b4828726e4 100644 --- a/src/providers/ldap/sdap_async.h +++ b/src/providers/ldap/sdap_async.h @@ -299,13 +299,13 @@ int sdap_deref_search_recv(struct tevent_req *req, struct tevent_req * sdap_sd_search_send(TALLOC_CTX *memctx, - struct tevent_context *ev, - struct sdap_options *opts, - struct sdap_handle *sh, - const char *base_dn, - int sd_flags, - const char **attrs, - int timeout); + struct tevent_context *ev, + struct sdap_options *opts, + struct sdap_handle *sh, + const char *base_dn, + int sd_flags, + const char **attrs, + int timeout); int sdap_sd_search_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, size_t *_reply_count, diff --git a/src/responder/sudo/sudosrv_cmd.c b/src/responder/sudo/sudosrv_cmd.c index 3bed22b6fc..0a7e0d9dd4 100644 --- a/src/responder/sudo/sudosrv_cmd.c +++ b/src/responder/sudo/sudosrv_cmd.c @@ -283,7 +283,7 @@ static int sudosrv_cmd_get_defaults(struct cli_ctx *cli_ctx) struct cli_protocol_version *register_cli_protocol_version(void) { static struct cli_protocol_version sudo_cli_protocol_version[] = { - {1, "2012-05-14", "require uid and domain"}, + {1, "2012-05-14", "require uid and domain"}, {0, NULL, NULL} }; diff --git a/src/sss_client/nfs/nfsidmap_internal.h b/src/sss_client/nfs/nfsidmap_internal.h index 07547f8400..d4c1677117 100644 --- a/src/sss_client/nfs/nfsidmap_internal.h +++ b/src/sss_client/nfs/nfsidmap_internal.h @@ -41,33 +41,33 @@ struct conf_list *get_local_realms(void); typedef struct trans_func * (*libnfsidmap_plugin_init_t)(void); struct trans_func { - char *name; - int (*init)(void); - int (*princ_to_ids)(char *secname, char *princ, uid_t *uid, gid_t *gid, - extra_mapping_params **ex); - int (*name_to_uid)(char *name, uid_t *uid); - int (*name_to_gid)(char *name, gid_t *gid); - int (*uid_to_name)(uid_t uid, char *domain, char *name, size_t len); - int (*gid_to_name)(gid_t gid, char *domain, char *name, size_t len); - int (*gss_princ_to_grouplist)(char *secname, char *princ, gid_t *groups, - int *ngroups, extra_mapping_params **ex); + char *name; + int (*init)(void); + int (*princ_to_ids)(char *secname, char *princ, uid_t *uid, gid_t *gid, + extra_mapping_params **ex); + int (*name_to_uid)(char *name, uid_t *uid); + int (*name_to_gid)(char *name, gid_t *gid); + int (*uid_to_name)(uid_t uid, char *domain, char *name, size_t len); + int (*gid_to_name)(gid_t gid, char *domain, char *name, size_t len); + int (*gss_princ_to_grouplist)(char *secname, char *princ, gid_t *groups, + int *ngroups, extra_mapping_params **ex); }; struct mapping_plugin { - void *dl_handle; - struct trans_func *trans; + void *dl_handle; + struct trans_func *trans; }; typedef enum { - IDTYPE_USER = 1, - IDTYPE_GROUP = 2 + IDTYPE_USER = 1, + IDTYPE_GROUP = 2 } idtypes; extern int idmap_verbosity; extern nfs4_idmap_log_function_t idmap_log_func; /* Level zero always prints, others print depending on verbosity level */ #define IDMAP_LOG(LVL, MSG) \ - do { if (LVL <= idmap_verbosity) (*idmap_log_func)MSG; } while (0) + do { if (LVL <= idmap_verbosity) (*idmap_log_func)MSG; } while (0) /* diff --git a/src/sss_client/nss_group.c b/src/sss_client/nss_group.c index 5ab2bdf78d..086b2fc51d 100644 --- a/src/sss_client/nss_group.c +++ b/src/sss_client/nss_group.c @@ -523,8 +523,8 @@ enum nss_status _nss_sss_getgrgid_r(gid_t gid, struct group *result, /* Caught once glibc passing in buffer == 0x0 */ if (!buffer || !buflen) { - *errnop = ERANGE; - return NSS_STATUS_TRYAGAIN; + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; } ret = sss_nss_mc_getgrgid(gid, result, buffer, buflen); @@ -659,8 +659,8 @@ static enum nss_status internal_getgrent_r(struct group *result, /* Caught once glibc passing in buffer == 0x0 */ if (!buffer || !buflen) { - *errnop = ERANGE; - return NSS_STATUS_TRYAGAIN; + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; } /* if there are leftovers return the next one */ diff --git a/src/sss_client/nss_netgroup.c b/src/sss_client/nss_netgroup.c index 3a1834a311..9e75052b09 100644 --- a/src/sss_client/nss_netgroup.c +++ b/src/sss_client/nss_netgroup.c @@ -232,8 +232,8 @@ static enum nss_status internal_getnetgrent_r(struct __netgrent *result, /* Caught once glibc passing in buffer == 0x0 */ if (!buffer || !buflen) { - *errnop = ERANGE; - return NSS_STATUS_TRYAGAIN; + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; } /* If we're already processing result data, continue to diff --git a/src/sss_client/nss_passwd.c b/src/sss_client/nss_passwd.c index 96368bd6ee..945793219f 100644 --- a/src/sss_client/nss_passwd.c +++ b/src/sss_client/nss_passwd.c @@ -252,8 +252,8 @@ enum nss_status _nss_sss_getpwuid_r(uid_t uid, struct passwd *result, /* Caught once glibc passing in buffer == 0x0 */ if (!buffer || !buflen) { - *errnop = ERANGE; - return NSS_STATUS_TRYAGAIN; + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; } ret = sss_nss_mc_getpwuid(uid, result, buffer, buflen); @@ -380,8 +380,8 @@ static enum nss_status internal_getpwent_r(struct passwd *result, /* Caught once glibc passing in buffer == 0x0 */ if (!buffer || !buflen) { - *errnop = ERANGE; - return NSS_STATUS_TRYAGAIN; + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; } /* if there are leftovers return the next one */ diff --git a/src/sss_client/nss_services.c b/src/sss_client/nss_services.c index 13cb4c3ab1..968a60d845 100644 --- a/src/sss_client/nss_services.c +++ b/src/sss_client/nss_services.c @@ -282,8 +282,8 @@ _nss_sss_getservbyport_r(int port, const char *protocol, /* Caught once glibc passing in buffer == 0x0 */ if (!buffer || !buflen) { - *errnop = ERANGE; - return NSS_STATUS_TRYAGAIN; + *errnop = ERANGE; + return NSS_STATUS_TRYAGAIN; } if (protocol) { diff --git a/src/util/inotify.c b/src/util/inotify.c index ffc15ad4db..98fe4051ca 100644 --- a/src/util/inotify.c +++ b/src/util/inotify.c @@ -433,7 +433,7 @@ static errno_t copy_filenames(struct snotify_ctx *snctx, ret = resolve_filename(snctx, filename, resolved, sizeof(resolved)); if (ret != EOK) { - return ret; + return ret; } strncpy(fcopy, resolved, sizeof(fcopy) - 1); diff --git a/src/util/signal.c b/src/util/signal.c index d77b79dd36..4c0649d164 100644 --- a/src/util/signal.c +++ b/src/util/signal.c @@ -35,23 +35,23 @@ void BlockSignals(bool block, int signum) { #ifdef HAVE_SIGPROCMASK - sigset_t set; - sigemptyset(&set); - sigaddset(&set,signum); - sigprocmask(block?SIG_BLOCK:SIG_UNBLOCK,&set,NULL); + sigset_t set; + sigemptyset(&set); + sigaddset(&set,signum); + sigprocmask(block?SIG_BLOCK:SIG_UNBLOCK,&set,NULL); #elif defined(HAVE_SIGBLOCK) - if (block) { - sigblock(sigmask(signum)); - } else { - sigsetmask(siggetmask() & ~sigmask(signum)); - } + if (block) { + sigblock(sigmask(signum)); + } else { + sigsetmask(siggetmask() & ~sigmask(signum)); + } #else - /* yikes! This platform can't block signals? */ - static int done; - if (!done) { - DEBUG(SSSDBG_FATAL_FAILURE,"WARNING: No signal blocking available\n"); - done=1; - } +/* yikes! This platform can't block signals? */ + static int done; + if (!done) { + DEBUG(SSSDBG_FATAL_FAILURE,"WARNING: No signal blocking available\n"); + done=1; + } #endif } @@ -65,25 +65,25 @@ void BlockSignals(bool block, int signum) void (*CatchSignal(int signum,void (*handler)(int )))(int) { #ifdef HAVE_SIGACTION - struct sigaction act; - struct sigaction oldact; + struct sigaction act; + struct sigaction oldact; - memset(&act, 0, sizeof(act)); + memset(&act, 0, sizeof(act)); - act.sa_handler = handler; + act.sa_handler = handler; #ifdef SA_RESTART - /* - * We *want* SIGALRM to interrupt a system call. - */ - if(signum != SIGALRM) - act.sa_flags = SA_RESTART; + /* + * We *want* SIGALRM to interrupt a system call. + */ + if(signum != SIGALRM) + act.sa_flags = SA_RESTART; #endif - sigemptyset(&act.sa_mask); - sigaddset(&act.sa_mask,signum); - sigaction(signum,&act,&oldact); - return oldact.sa_handler; + sigemptyset(&act.sa_mask); + sigaddset(&act.sa_mask,signum); + sigaction(signum,&act,&oldact); + return oldact.sa_handler; #else /* !HAVE_SIGACTION */ - /* FIXME: need to handle sigvec and systems with broken signal() */ - return signal(signum, handler); + /* FIXME: need to handle sigvec and systems with broken signal() */ + return signal(signum, handler); #endif }