[PATCH v12 10/32] Code cleanup: Add enum for openp_flags

[Jan Kratochvil <jan.kratochvil@redhat.com>]

Hi,

it is for many reasons better, in C++ it could be even type safe.


Jan


gdb/ChangeLog
2015-08-18  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* cli/cli-cmds.c (find_and_open_script): Use enum openp_flags for
	search_flags.
	* defs.h (OPF_TRY_CWD_FIRST, OPF_SEARCH_IN_PATH, OPF_RETURN_REALPATH):
	Wrap them to a new ...
	(enum openp_flags): ... enum.
	(openp): Update prototype.
	* dwarf2read.c (try_open_dwop_file): Use enum openp_flags for flags.
	* source.c (openp): Update opts parameter type.  Move out OPF_*
	comments.
---
 0 files changed

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index bcd7802..a5a4c7c 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -500,7 +500,7 @@ find_and_open_script (const char *script_file, int search_path,
   char *file;
   int fd;
   struct cleanup *old_cleanups;
-  int search_flags = OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH;
+  enum openp_flags search_flags = OPF_TRY_CWD_FIRST | OPF_RETURN_REALPATH;
 
   file = tilde_expand (script_file);
   old_cleanups = make_cleanup (xfree, file);
diff --git a/gdb/defs.h b/gdb/defs.h
index f4951ab..3d248f6 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -321,11 +321,25 @@ 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
+enum openp_flags
+{
+  /* Try to open ./STRING before searching PATH (ie pretend the first
+     element of PATH is ".").  This also indicates that, unless
+     OPF_SEARCH_IN_PATH is also specified, a slash in STRING disables
+     searching of the path (this is so that "exec-file ./foo" or
+     "symbol-file ./foo" insures that you get that particular version of
+     foo or an error message).  */
+  OPF_TRY_CWD_FIRST   = (1 << 0),
+
+  /* Absolute names will also be searched in path (we usually want this
+     for source files but not for executables).  */
+  OPF_SEARCH_IN_PATH  = (1 << 1),
+
+  /* See openp, to be removed.  */
+  OPF_RETURN_REALPATH = (1 << 2),
+};
 
-extern int openp (const char *, int, const char *, int, char **);
+extern int openp (const char *, enum 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 0c61df7..23b60f9 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -10450,7 +10450,8 @@ static bfd *
 try_open_dwop_file (const char *file_name, int is_dwp, int search_cwd)
 {
   bfd *sym_bfd;
-  int desc, flags;
+  int desc;
+  enum openp_flags flags;
   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 "."
diff --git a/gdb/source.c b/gdb/source.c
index 4cd3046..888ed2b 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -743,17 +743,6 @@ dirnames_to_char_ptr_vec_target_exc (const char *string)
 
    OPTS specifies the function behaviour in specific cases.
 
-   If OPF_TRY_CWD_FIRST, try to open ./STRING before searching PATH.
-   (ie pretend the first element of PATH is ".").  This also indicates
-   that, unless OPF_SEARCH_IN_PATH is also specified, a slash in STRING
-   disables searching of the path (this is so that "exec-file ./foo" or
-   "symbol-file ./foo" insures that you get that particular version of
-   foo or an error message).
-
-   If OPTS has OPF_SEARCH_IN_PATH set, absolute names will also be
-   searched in path (we usually want this for source files but not for
-   executables).
-
    If FILENAME_OPENED is non-null, set it to a newly allocated string naming
    the actual file opened (this string will always start with a "/").  We
    have to take special pains to avoid doubling the "/" between the directory
@@ -771,7 +760,7 @@ dirnames_to_char_ptr_vec_target_exc (const char *string)
 /*  >>>> 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, enum openp_flags opts, const char *string,
        int mode, char **filename_opened)
 {
   int fd;