* cygcheck.cc (pathlike::check_existence): Remove class name from declaration.
(display_internet_error): Use proper format specifier for DWORD. (environ): Remove unneeded declaration. (main): Use brace around nested if to avoid an overly-helpful compiler warning. * dump_setup.cc (parse_filename): Reorganize nested if to avoid an overly-helpful compiler warning. * path.cc (GUID_shortcut): Use braces around part of initializer which needs them. (conv_fstab_spaces): Parenthesize assignment in while loop to avoid a compiler warning. (struct opt): Make static. * ps.cc (main): Reorganize nested if to avoid an overly-helpful compiler warning. * regtool.cc: Make some anonymous structs static to avoid a compiler warning. * ssp.c (lookup_thread_id): Initialize *tix to zero to avoid potential uninitialized use. * strace.cc (add_child): Use proper format specifier for DWORD. (remove_child): Ditto. (proc_child): Ditto.
This commit is contained in:
@@ -124,9 +124,9 @@ struct pathlike
|
||||
{
|
||||
char *dir;
|
||||
bool issys;
|
||||
void pathlike::check_existence (const char *fn, int showall, int verbose,
|
||||
char* first, const char *ext1 = "",
|
||||
const char *ext2 = "");
|
||||
void check_existence (const char *fn, int showall, int verbose,
|
||||
char* first, const char *ext1 = "",
|
||||
const char *ext2 = "");
|
||||
};
|
||||
|
||||
pathlike *paths;
|
||||
@@ -201,7 +201,7 @@ display_internet_error (const char *message, ...)
|
||||
sizeof (err_buf), NULL) == 0)
|
||||
strcpy (err_buf, "(Unknown error)");
|
||||
|
||||
fprintf (stderr, "cygcheck: %s: %s (win32 error %d)\n", message,
|
||||
fprintf (stderr, "cygcheck: %s: %s (win32 error %lu)\n", message,
|
||||
err_buf, err);
|
||||
}
|
||||
else
|
||||
@@ -901,9 +901,6 @@ cygcheck (const char *app)
|
||||
return track_down (papp, ".exe", 0);
|
||||
}
|
||||
|
||||
|
||||
extern char **environ;
|
||||
|
||||
struct RegInfo
|
||||
{
|
||||
RegInfo *prev;
|
||||
@@ -2115,11 +2112,13 @@ main (int argc, char **argv)
|
||||
if (posixly == NULL)
|
||||
putenv ("POSIXLY_CORRECT=");
|
||||
|
||||
if (argc == 0 && !sysinfo && !keycheck && !check_setup && !list_package)
|
||||
if (givehelp)
|
||||
usage (stdout, 0);
|
||||
else
|
||||
usage (stderr, 1);
|
||||
if ((argc == 0) && !sysinfo && !keycheck && !check_setup && !list_package)
|
||||
{
|
||||
if (givehelp)
|
||||
usage (stdout, 0);
|
||||
else
|
||||
usage (stderr, 1);
|
||||
}
|
||||
|
||||
if ((check_setup || sysinfo || find_package || list_package || grep_packages)
|
||||
&& keycheck)
|
||||
|
Reference in New Issue
Block a user