* proc-why.c: Fix several coding-style issues.

(proc_prettyfprint_why): Use ARRAY_SIZE.
This commit is contained in:
Mark Kettenis 2004-10-28 11:04:07 +00:00
parent f39c96a9c0
commit 7a9525427b
2 changed files with 52 additions and 46 deletions

View file

@ -1,3 +1,8 @@
2004-10-28 Mark Kettenis <kettenis@jive.nl>
* proc-why.c: Fix several coding-style issues.
(proc_prettyfprint_why): Use ARRAY_SIZE.
2004-10-27 Jim Blandy <jimb@redhat.com> 2004-10-27 Jim Blandy <jimb@redhat.com>
* remote.c (fetch_register_using_p): Construct 'p' packet in a * remote.c (fetch_register_using_p): Construct 'p' packet in a

View file

@ -1,34 +1,28 @@
/* Machine independent support for SVR4 /proc (process file system) for GDB. /* Machine-independent support for SVR4 /proc (process file system)
Copyright 1999, 2000 Free Software Foundation, Inc.
Copyright 1999, 2000, 2004 Free Software Foundation, Inc.
Written by Michael Snyder at Cygnus Solutions. Written by Michael Snyder at Cygnus Solutions.
Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others. Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others.
This file is part of GDB. This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is free software; you can redistribute it and/or modify This program is distributed in the hope that it will be useful,
it under the terms of the GNU General Public License as published by but WITHOUT ANY WARRANTY; without even the implied warranty of
the Free Software Foundation; either version 2 of the License, or MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
(at your option) any later version. GNU General Public License for more details.
This program is distributed in the hope that it will be useful, You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of along with this program; if not, write to the Free Software
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Foundation, Inc., 59 Temple Place - Suite 330,
GNU General Public License for more details. Boston, MA 02111-1307, USA. */
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/*
* Pretty-print the pr_why value.
*
* Arguments: unsigned long flags, int verbose
*
*/
#include "defs.h" #include "defs.h"
#if defined(NEW_PROC_API) #ifdef NEW_PROC_API
#define _STRUCTURED_PROC 1 #define _STRUCTURED_PROC 1
#endif #endif
@ -38,72 +32,78 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "proc-utils.h" #include "proc-utils.h"
/* Much of the information used in the /proc interface, particularly for /* Much of the information used in the /proc interface, particularly
printing status information, is kept as tables of structures of the for printing status information, is kept as tables of structures of
following form. These tables can be used to map numeric values to the following form. These tables can be used to map numeric values
their symbolic names and to a string that describes their specific use. */ to their symbolic names and to a string that describes their
specific use. */
struct trans { struct trans
int value; /* The numeric value */ {
char *name; /* The equivalent symbolic value */ int value; /* The numeric value. */
char *desc; /* Short description of value */ char *name; /* The equivalent symbolic value. */
char *desc; /* Short description of value. */
}; };
/* Translate values in the pr_why field of the prstatus struct. */ /* Translate values in the pr_why field of a `struct prstatus' or
`struct lwpstatus'. */
static struct trans pr_why_table[] = static struct trans pr_why_table[] =
{ {
#if defined (PR_REQUESTED) #if defined (PR_REQUESTED)
/* All platforms */ /* All platforms. */
{ PR_REQUESTED, "PR_REQUESTED", { PR_REQUESTED, "PR_REQUESTED",
"Directed to stop by debugger via P(IO)CSTOP or P(IO)CWSTOP" }, "Directed to stop by debugger via P(IO)CSTOP or P(IO)CWSTOP" },
#endif #endif
#if defined (PR_SIGNALLED) #if defined (PR_SIGNALLED)
/* All platforms */ /* All platforms. */
{ PR_SIGNALLED, "PR_SIGNALLED", "Receipt of a traced signal" }, { PR_SIGNALLED, "PR_SIGNALLED", "Receipt of a traced signal" },
#endif #endif
#if defined (PR_SYSENTRY) #if defined (PR_SYSENTRY)
/* All platforms */ /* All platforms. */
{ PR_SYSENTRY, "PR_SYSENTRY", "Entry to a traced system call" }, { PR_SYSENTRY, "PR_SYSENTRY", "Entry to a traced system call" },
#endif #endif
#if defined (PR_SYSEXIT) #if defined (PR_SYSEXIT)
/* All platforms */ /* All platforms. */
{ PR_SYSEXIT, "PR_SYSEXIT", "Exit from a traced system call" }, { PR_SYSEXIT, "PR_SYSEXIT", "Exit from a traced system call" },
#endif #endif
#if defined (PR_JOBCONTROL) #if defined (PR_JOBCONTROL)
/* All platforms */ /* All platforms. */
{ PR_JOBCONTROL, "PR_JOBCONTROL", "Default job control stop signal action" }, { PR_JOBCONTROL, "PR_JOBCONTROL", "Default job control stop signal action" },
#endif #endif
#if defined (PR_FAULTED) #if defined (PR_FAULTED)
/* All platforms */ /* All platforms. */
{ PR_FAULTED, "PR_FAULTED", "Incurred a traced hardware fault" }, { PR_FAULTED, "PR_FAULTED", "Incurred a traced hardware fault" },
#endif #endif
#if defined (PR_SUSPENDED) #if defined (PR_SUSPENDED)
/* Solaris and UnixWare */ /* Solaris and UnixWare. */
{ PR_SUSPENDED, "PR_SUSPENDED", "Process suspended" }, { PR_SUSPENDED, "PR_SUSPENDED", "Process suspended" },
#endif #endif
#if defined (PR_CHECKPOINT) #if defined (PR_CHECKPOINT)
/* Solaris only */ /* Solaris only. */
{ PR_CHECKPOINT, "PR_CHECKPOINT", "Process stopped at checkpoint" }, { PR_CHECKPOINT, "PR_CHECKPOINT", "Process stopped at checkpoint" },
#endif #endif
#if defined (PR_FORKSTOP) #if defined (PR_FORKSTOP)
/* OSF only */ /* OSF/1 only. */
{ PR_FORKSTOP, "PR_FORKSTOP", "Process stopped at end of fork call" }, { PR_FORKSTOP, "PR_FORKSTOP", "Process stopped at end of fork call" },
#endif #endif
#if defined (PR_TCRSTOP) #if defined (PR_TCRSTOP)
/* OSF only */ /* OSF/1 only. */
{ PR_TCRSTOP, "PR_TCRSTOP", "Process stopped on thread creation" }, { PR_TCRSTOP, "PR_TCRSTOP", "Process stopped on thread creation" },
#endif #endif
#if defined (PR_TTSTOP) #if defined (PR_TTSTOP)
/* OSF only */ /* OSF/1 only. */
{ PR_TTSTOP, "PR_TTSTOP", "Process stopped on thread termination" }, { PR_TTSTOP, "PR_TTSTOP", "Process stopped on thread termination" },
#endif #endif
#if defined (PR_DEAD) #if defined (PR_DEAD)
/* OSF only */ /* OSF/1 only. */
{ PR_DEAD, "PR_DEAD", "Process stopped in exit system call" }, { PR_DEAD, "PR_DEAD", "Process stopped in exit system call" },
#endif #endif
}; };
/* Pretty-print the pr_why field of a `struct prstatus' or `struct
lwpstatus'. */
void void
proc_prettyfprint_why (FILE *file, unsigned long why, unsigned long what, proc_prettyfprint_why (FILE *file, unsigned long why, unsigned long what,
int verbose) int verbose)
@ -113,7 +113,7 @@ proc_prettyfprint_why (FILE *file, unsigned long why, unsigned long what,
if (why == 0) if (why == 0)
return; return;
for (i = 0; i < sizeof (pr_why_table) / sizeof (pr_why_table[0]); i++) for (i = 0; i < ARRAY_SIZE (pr_why_table); i++)
if (why == pr_why_table[i].value) if (why == pr_why_table[i].value)
{ {
fprintf (file, "%s ", pr_why_table[i].name); fprintf (file, "%s ", pr_why_table[i].name);
@ -123,7 +123,7 @@ proc_prettyfprint_why (FILE *file, unsigned long why, unsigned long what,
switch (why) { switch (why) {
#ifdef PR_REQUESTED #ifdef PR_REQUESTED
case PR_REQUESTED: case PR_REQUESTED:
break; /* Nothing more to print. */ break; /* Nothing more to print. */
#endif #endif
#ifdef PR_SIGNALLED #ifdef PR_SIGNALLED
case PR_SIGNALLED: case PR_SIGNALLED:
@ -165,6 +165,7 @@ proc_prettyfprint_why (FILE *file, unsigned long why, unsigned long what,
return; return;
} }
fprintf (file, "Unknown pr_why.\n"); fprintf (file, "Unknown pr_why.\n");
} }