From patchwork Fri Jul 17 08:30:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 40122 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 46FC13938C19; Fri, 17 Jul 2020 08:30:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 46FC13938C19 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594974629; bh=l+v3D1ws9GCNgyl43Dp43piBcfrqbrQEBMN5PdSz++w=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=xREtNEtV2JNFcnDBfutUOjaZcVEwjBoNckJdMh25xffvB7G+Yq+hgeL9V3AgMPdpm GadKO3vPFtU179lgk1NfNX82IiOSqrkiSon5q+xje/76JGyvp3TZYWPHHoHz5qTmUf Bf/7FY1tzMeAOGbHgLqqEdBn8fuI2L9eERSoXcNY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by sourceware.org (Postfix) with ESMTP id 0CE653938C19 for ; Fri, 17 Jul 2020 08:30:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0CE653938C19 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-10-NYVEGI-5NE-cOAFEHmom2w-1; Fri, 17 Jul 2020 04:30:23 -0400 X-MC-Unique: NYVEGI-5NE-cOAFEHmom2w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1460D107BEF5 for ; Fri, 17 Jul 2020 08:30:23 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-136.ams2.redhat.com [10.36.112.136]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65BA010013D7 for ; Fri, 17 Jul 2020 08:30:22 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 03/11] nss_files: Consolidate line parse declarations in In-Reply-To: References: Message-Id: <25abf92483d67d37a316186891c6589cb4099630.1594974444.git.fweimer@redhat.com> Date: Fri, 17 Jul 2020 10:30:20 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" These functions should eventually have the same type, so it makes sense to declare them together. Tested-by: Carlos O'Donell Reviewed-by: Carlos O'Donell --- include/grp.h | 6 ----- include/gshadow.h | 6 ----- include/netdb.h | 13 ---------- include/netinet/ether.h | 6 ----- include/nss_files.h | 51 +++++++++++++++++++++++++++++++++++++ include/pwd.h | 6 ----- include/rpc/netdb.h | 6 ----- include/shadow.h | 6 ----- nss/nss_files/files-parse.c | 1 + 9 files changed, 52 insertions(+), 49 deletions(-) diff --git a/include/grp.h b/include/grp.h index 58f7b4d233..2cd2475534 100644 --- a/include/grp.h +++ b/include/grp.h @@ -30,12 +30,6 @@ extern int __old_getgrnam_r (const char *__name, struct group *__resultbuf, char *__buffer, size_t __buflen, struct group **__result); -struct parser_data; -extern int _nss_files_parse_grent (char *line, struct group *result, - struct parser_data *data, - size_t datalen, int *errnop); -libc_hidden_proto (_nss_files_parse_grent) - #define DECLARE_NSS_PROTOTYPES(service) \ extern enum nss_status _nss_ ## service ## _setgrent (int); \ extern enum nss_status _nss_ ## service ## _endgrent (void); \ diff --git a/include/gshadow.h b/include/gshadow.h index aa6a5a693e..1cefcfc641 100644 --- a/include/gshadow.h +++ b/include/gshadow.h @@ -10,11 +10,5 @@ extern int __sgetsgent_r (const char *string, struct sgrp *resbuf, char *buffer, size_t buflen, struct sgrp **result) attribute_hidden; -struct parser_data; -extern int _nss_files_parse_sgent (char *line, struct sgrp *result, - struct parser_data *data, - size_t datalen, int *errnop); -libc_hidden_proto (_nss_files_parse_sgent) - # endif /* !_ISOMAC */ #endif diff --git a/include/netdb.h b/include/netdb.h index 6b431350df..49d63c1338 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -202,23 +202,10 @@ libc_hidden_proto (ruserpass) #include -struct parser_data; -extern int _nss_files_parse_protoent (char *line, struct protoent *result, - struct parser_data *data, - size_t datalen, int *errnop); -extern int _nss_files_parse_servent (char *line, struct servent *result, - struct parser_data *data, - size_t datalen, int *errnop); -extern int _nss_files_parse_netent (char *line, struct netent *result, - struct parser_data *data, - size_t datalen, int *errnop); extern enum nss_status _nss_netgroup_parseline (char **cursor, struct __netgrent *result, char *buffer, size_t buflen, int *errnop); -libnss_files_hidden_proto (_nss_files_parse_protoent) -libnss_files_hidden_proto (_nss_files_parse_servent) -libnss_files_hidden_proto (_nss_files_parse_netent) libnss_files_hidden_proto (_nss_netgroup_parseline) #define DECLARE_NSS_PROTOTYPES(service) \ diff --git a/include/netinet/ether.h b/include/netinet/ether.h index 8fd05f8193..1763a7e04c 100644 --- a/include/netinet/ether.h +++ b/include/netinet/ether.h @@ -15,12 +15,6 @@ struct etherent struct ether_addr e_addr; }; -struct parser_data; -extern int _nss_files_parse_etherent (char *line, struct etherent *result, - struct parser_data *data, - size_t datalen, int *errnop); -libnss_files_hidden_proto (_nss_files_parse_etherent) - #define DECLARE_NSS_PROTOTYPES(service) \ extern enum nss_status _nss_ ## service ## _setetherent (int __stayopen); \ extern enum nss_status _nss_ ## service ## _endetherent (void); \ diff --git a/include/nss_files.h b/include/nss_files.h index 17144b7932..54b354afb3 100644 --- a/include/nss_files.h +++ b/include/nss_files.h @@ -25,4 +25,55 @@ FILE *__nss_files_fopen (const char *path); libc_hidden_proto (__nss_files_fopen) +struct parser_data; +struct etherent; +struct group; +struct netent; +struct passwd; +struct protoent; +struct rpcent; +struct servent; +struct sgrp; +struct spwd; + +/* Instances of the parse_line function from + nss/nss_files/files-parse.c. */ +extern int _nss_files_parse_etherent (char *line, struct etherent *result, + struct parser_data *data, + size_t datalen, int *errnop); +extern int _nss_files_parse_grent (char *line, struct group *result, + struct parser_data *data, + size_t datalen, int *errnop); +extern int _nss_files_parse_netent (char *line, struct netent *result, + struct parser_data *data, + size_t datalen, int *errnop); +extern int _nss_files_parse_protoent (char *line, struct protoent *result, + struct parser_data *data, + size_t datalen, int *errnop); +extern int _nss_files_parse_pwent (char *line, struct passwd *result, + struct parser_data *data, + size_t datalen, int *errnop); +extern int _nss_files_parse_rpcent (char *line, struct rpcent *result, + struct parser_data *data, + size_t datalen, int *errnop); +extern int _nss_files_parse_servent (char *line, struct servent *result, + struct parser_data *data, + size_t datalen, int *errnop); +extern int _nss_files_parse_sgent (char *line, struct sgrp *result, + struct parser_data *data, + size_t datalen, int *errnop); +extern int _nss_files_parse_spent (char *line, struct spwd *result, + struct parser_data *data, + size_t datalen, int *errnop); + +libnss_files_hidden_proto (_nss_files_parse_etherent) +libc_hidden_proto (_nss_files_parse_grent) +libnss_files_hidden_proto (_nss_files_parse_netent) +libnss_files_hidden_proto (_nss_files_parse_protoent) +libc_hidden_proto (_nss_files_parse_pwent) +libnss_files_hidden_proto (_nss_files_parse_rpcent) +libnss_files_hidden_proto (_nss_files_parse_servent) +libc_hidden_proto (_nss_files_parse_sgent) +libc_hidden_proto (_nss_files_parse_spent) + #endif /* _NSS_FILES_H */ diff --git a/include/pwd.h b/include/pwd.h index fd23fe9d6b..f8975d4957 100644 --- a/include/pwd.h +++ b/include/pwd.h @@ -26,12 +26,6 @@ extern int __fgetpwent_r (FILE * __stream, struct passwd *__resultbuf, #include -struct parser_data; -extern int _nss_files_parse_pwent (char *line, struct passwd *result, - struct parser_data *data, - size_t datalen, int *errnop); -libc_hidden_proto (_nss_files_parse_pwent) - #define DECLARE_NSS_PROTOTYPES(service) \ extern enum nss_status _nss_ ## service ## _setpwent (int); \ extern enum nss_status _nss_ ## service ## _endpwent (void); \ diff --git a/include/rpc/netdb.h b/include/rpc/netdb.h index dc0d0e26b9..b9f591ca3b 100644 --- a/include/rpc/netdb.h +++ b/include/rpc/netdb.h @@ -24,12 +24,6 @@ extern int __getrpcent_r (struct rpcent *__result_buf, char *__buffer, extern int __old_getrpcent_r (struct rpcent *__result_buf, char *__buffer, size_t __buflen, struct rpcent **__result); -struct parser_data; -extern int _nss_files_parse_rpcent (char *line, struct rpcent *result, - struct parser_data *data, - size_t datalen, int *errnop); -libnss_files_hidden_proto (_nss_files_parse_rpcent) - #define DECLARE_NSS_PROTOTYPES(service) \ extern enum nss_status _nss_ ## service ## _setrpcent (int); \ extern enum nss_status _nss_ ## service ## _endrpcent (void); \ diff --git a/include/shadow.h b/include/shadow.h index 5168d8d4a3..fb1681909f 100644 --- a/include/shadow.h +++ b/include/shadow.h @@ -25,12 +25,6 @@ extern int __fgetspent_r (FILE *__stream, struct spwd *__result_buf, extern int __lckpwdf (void); extern int __ulckpwdf (void); -struct parser_data; -extern int _nss_files_parse_spent (char *line, struct spwd *result, - struct parser_data *data, - size_t datalen, int *errnop); -libc_hidden_proto (_nss_files_parse_spent) - #define DECLARE_NSS_PROTOTYPES(service) \ extern enum nss_status _nss_ ## service ## _setspent (int); \ extern enum nss_status _nss_ ## service ## _endspent (void); \ diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index a563d818f7..382028765b 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -21,6 +21,7 @@ #include #include #include +#include /* These symbols are defined by the including source file: