This removes both copies of do_closedir_cleanup in favor of a new
unique_ptr specialization.
Tested by the buildbot, though I'm not sure that these code paths are
exercised there.
ChangeLog
2018-05-04 Tom Tromey <tom@tromey.com>
* nto-procfs.c (do_closedir_cleanup): Remove.
(procfs_pidlist): Use gdb_dir_up.
* procfs.c (do_closedir_cleanup): Remove.
(proc_update_threads): Use gdb_dir_up.
* common/filestuff.h (struct gdb_dir_deleter): New.
(gdb_dir_up): New typedef.
2018-05-04 Tom Tromey <tom@tromey.com>
2018-05-04 Tom Tromey <tom@tromey.com>
+ * nto-procfs.c (do_closedir_cleanup): Remove.
+ (procfs_pidlist): Use gdb_dir_up.
+ * procfs.c (do_closedir_cleanup): Remove.
+ (proc_update_threads): Use gdb_dir_up.
+ * common/filestuff.h (struct gdb_dir_deleter): New.
+ (gdb_dir_up): New typedef.
+
+2018-05-04 Tom Tromey <tom@tromey.com>
+
* ada-lang.c (print_mention_exception): Use std::string.
2018-05-04 Tom Tromey <tom@tromey.com>
* ada-lang.c (print_mention_exception): Use std::string.
2018-05-04 Tom Tromey <tom@tromey.com>
#ifndef FILESTUFF_H
#define FILESTUFF_H
#ifndef FILESTUFF_H
#define FILESTUFF_H
/* Note all the file descriptors which are open when this is called.
These file descriptors will not be closed by close_most_fds. */
/* Note all the file descriptors which are open when this is called.
These file descriptors will not be closed by close_most_fds. */
extern struct cleanup *make_cleanup_close (int fd);
extern struct cleanup *make_cleanup_close (int fd);
+struct gdb_dir_deleter
+{
+ void operator() (DIR *dir) const
+ {
+ closedir (dir);
+ }
+};
+
+/* A unique pointer to a DIR. */
+
+typedef std::unique_ptr<DIR, gdb_dir_deleter> gdb_dir_up;
+
-do_closedir_cleanup (void *dir)
-{
- closedir (dir);
-}
-
-static void
procfs_pidlist (const char *args, int from_tty)
{
procfs_pidlist (const char *args, int from_tty)
{
struct dirent *dirp = NULL;
char buf[PATH_MAX];
procfs_info *pidinfo = NULL;
struct dirent *dirp = NULL;
char buf[PATH_MAX];
procfs_info *pidinfo = NULL;
pid_t num_threads = 0;
pid_t pid;
char name[512];
pid_t num_threads = 0;
pid_t pid;
char name[512];
- struct cleanup *cleanups;
char procfs_dir[PATH_MAX];
snprintf (procfs_dir, sizeof (procfs_dir), "%s%s",
(nodestr != NULL) ? nodestr : "", "/proc");
char procfs_dir[PATH_MAX];
snprintf (procfs_dir, sizeof (procfs_dir), "%s%s",
(nodestr != NULL) ? nodestr : "", "/proc");
- dp = opendir (procfs_dir);
+ gdb_dir_up dp (opendir (procfs_dir));
if (dp == NULL)
{
fprintf_unfiltered (gdb_stderr, "failed to opendir \"%s\" - %d (%s)",
if (dp == NULL)
{
fprintf_unfiltered (gdb_stderr, "failed to opendir \"%s\" - %d (%s)",
- cleanups = make_cleanup (do_closedir_cleanup, dp);
-
/* Start scan at first pid. */
/* Start scan at first pid. */
do
{
/* Get the right pid and procfs path for the pid. */
do
{
do
{
/* Get the right pid and procfs path for the pid. */
do
{
+ dirp = readdir (dp.get ());
- {
- do_cleanups (cleanups);
- return;
- }
snprintf (buf, sizeof (buf), "%s%s/%s/as",
(nodestr != NULL) ? nodestr : "",
"/proc", dirp->d_name);
snprintf (buf, sizeof (buf), "%s%s/%s/as",
(nodestr != NULL) ? nodestr : "",
"/proc", dirp->d_name);
}
}
while (dirp != NULL);
}
}
while (dirp != NULL);
-
- do_cleanups (cleanups);
- return;
return 0; /* keep iterating */
}
return 0; /* keep iterating */
}
-static void
-do_closedir_cleanup (void *dir)
-{
- closedir ((DIR *) dir);
-}
-
static int
proc_update_threads (procinfo *pi)
{
char pathname[MAX_PROC_NAME_SIZE + 16];
struct dirent *direntry;
static int
proc_update_threads (procinfo *pi)
{
char pathname[MAX_PROC_NAME_SIZE + 16];
struct dirent *direntry;
- struct cleanup *old_chain = NULL;
int lwpid;
/* We should never have to apply this operation to any procinfo
int lwpid;
/* We should never have to apply this operation to any procinfo
strcpy (pathname, pi->pathname);
strcat (pathname, "/lwp");
strcpy (pathname, pi->pathname);
strcat (pathname, "/lwp");
- if ((dirp = opendir (pathname)) == NULL)
+ dirp.reset (opendir (pathname));
+ if (dirp == NULL)
proc_error (pi, "update_threads, opendir", __LINE__);
proc_error (pi, "update_threads, opendir", __LINE__);
- old_chain = make_cleanup (do_closedir_cleanup, dirp);
- while ((direntry = readdir (dirp)) != NULL)
+ while ((direntry = readdir (dirp.get ())) != NULL)
if (direntry->d_name[0] != '.') /* skip '.' and '..' */
{
lwpid = atoi (&direntry->d_name[0]);
if (direntry->d_name[0] != '.') /* skip '.' and '..' */
{
lwpid = atoi (&direntry->d_name[0]);
proc_error (pi, "update_threads, create_procinfo", __LINE__);
}
pi->threads_valid = 1;
proc_error (pi, "update_threads, create_procinfo", __LINE__);
}
pi->threads_valid = 1;
- do_cleanups (old_chain);