From patchwork Tue Feb 13 02:31:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 25920 Received: (qmail 120739 invoked by alias); 13 Feb 2018 02:31:34 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 119550 invoked by uid 89); 13 Feb 2018 02:31:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy= X-HELO: barracuda.ebox.ca Received: from barracuda.ebox.ca (HELO barracuda.ebox.ca) (96.127.255.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 13 Feb 2018 02:31:30 +0000 X-ASG-Debug-ID: 1518489079-0c856e65d44bec400001-fS2M51 Received: from smtp.ebox.ca (smtp.electronicbox.net [96.127.255.82]) by barracuda.ebox.ca with ESMTP id SJH2DUFuRste1wRV (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Feb 2018 21:31:19 -0500 (EST) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.lan (192-222-251-162.qc.cable.ebox.net [192.222.251.162]) by smtp.ebox.ca (Postfix) with ESMTP id A21C1441D64; Mon, 12 Feb 2018 21:31:18 -0500 (EST) From: Simon Marchi X-Barracuda-Effective-Source-IP: 192-222-251-162.qc.cable.ebox.net[192.222.251.162] X-Barracuda-Apparent-Source-IP: 192.222.251.162 X-Barracuda-RBL-IP: 192.222.251.162 To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH] Use enum flags for flags passed to openp Date: Mon, 12 Feb 2018 21:31:17 -0500 X-ASG-Orig-Subj: [PATCH] Use enum flags for flags passed to openp Message-Id: <20180213023117.26302-1-simon.marchi@polymtl.ca> X-Barracuda-Connect: smtp.electronicbox.net[96.127.255.82] X-Barracuda-Start-Time: 1518489079 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 3232 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.47860 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-IsSubscribed: yes gdb/ChangeLog: * defs.h (enum openp_flags): New enum. (OPF_TRY_CWD_FIRST, OPF_SEARCH_IN_PATH, OPF_RETURN_REALPATH): Move to enum openp_flags. (openp_flags): New enum flags. (openp): Change parameter type to openp_flags. * source.c (openp): Change parameter type to openp_flags. * cli/cli-cmds.c (find_and_open_script): Use openp_flags. * dwarf2read.c (try_open_dwop_file): Use openp_flags. --- gdb/cli/cli-cmds.c | 2 +- gdb/defs.h | 14 ++++++++++---- gdb/dwarf2read.c | 4 ++-- gdb/source.c | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 18d1d4b383..c3962e939e 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -496,7 +496,7 @@ gdb::optional find_and_open_script (const char *script_file, int search_path) { int fd; - int search_flags = OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH; + openp_flags search_flags = OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH; gdb::optional opened; gdb::unique_xmalloc_ptr file (tilde_expand (script_file)); diff --git a/gdb/defs.h b/gdb/defs.h index 4fb2129b30..70389ad745 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -342,11 +342,17 @@ extern const char *pc_prefix (CORE_ADDR); /* From source.c */ /* See openp function definition for their description. */ -#define OPF_TRY_CWD_FIRST 0x01 -#define OPF_SEARCH_IN_PATH 0x02 -#define OPF_RETURN_REALPATH 0x04 -extern int openp (const char *, int, const char *, int, char **); +enum openp_flag +{ + OPF_TRY_CWD_FIRST = 0x01, + OPF_SEARCH_IN_PATH = 0x02, + OPF_RETURN_REALPATH = 0x04, +}; + +DEF_ENUM_FLAGS_TYPE(openp_flag, openp_flags); + +extern int openp (const char *, openp_flags, const char *, int, char **); extern int source_full_path_of (const char *, char **); diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index cbfd34154a..93453431c1 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -12880,7 +12880,7 @@ static gdb_bfd_ref_ptr try_open_dwop_file (struct dwarf2_per_objfile *dwarf2_per_objfile, const char *file_name, int is_dwp, int search_cwd) { - int desc, flags; + int desc; char *absolute_name; /* Blech. OPF_TRY_CWD_FIRST also disables searching the path list if FILE_NAME contains a '/'. So we can't use it. Instead prepend "." @@ -12899,7 +12899,7 @@ try_open_dwop_file (struct dwarf2_per_objfile *dwarf2_per_objfile, else search_path = xstrdup (debug_file_directory); - flags = OPF_RETURN_REALPATH; + openp_flags flags = OPF_RETURN_REALPATH; if (is_dwp) flags |= OPF_SEARCH_IN_PATH; desc = openp (search_path, flags, file_name, diff --git a/gdb/source.c b/gdb/source.c index 009bec5285..eba06f6e6b 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -736,7 +736,7 @@ is_regular_file (const char *name, int *errno_ptr) /* >>>> This should only allow files of certain types, >>>> eg executable, non-directory. */ int -openp (const char *path, int opts, const char *string, +openp (const char *path, openp_flags opts, const char *string, int mode, char **filename_opened) { int fd;