* 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:
@ -91,24 +91,25 @@ parse_filename (const char *in_fn, fileparse& f)
|
||||
f.pkg[0] = f.what[0] = '\0';
|
||||
p = base (fn);
|
||||
for (ver = p; *ver; ver++)
|
||||
if (*ver == '-')
|
||||
if (isdigit (ver[1]))
|
||||
{
|
||||
*ver++ = '\0';
|
||||
strcpy (f.pkg, p);
|
||||
break;
|
||||
}
|
||||
else if (strcasecmp (ver, "-src") == 0 ||
|
||||
strcasecmp (ver, "-patch") == 0)
|
||||
{
|
||||
*ver++ = '\0';
|
||||
strcpy (f.pkg, p);
|
||||
strcpy (f.what, strlwr (ver));
|
||||
strcpy (f.pkgtar, p);
|
||||
strcat (f.pkgtar, f.tail);
|
||||
ver = strchr (ver, '\0');
|
||||
break;
|
||||
}
|
||||
if (*ver != '-')
|
||||
continue;
|
||||
else if (isdigit (ver[1]))
|
||||
{
|
||||
*ver++ = '\0';
|
||||
strcpy (f.pkg, p);
|
||||
break;
|
||||
}
|
||||
else if (strcasecmp (ver, "-src") == 0 ||
|
||||
strcasecmp (ver, "-patch") == 0)
|
||||
{
|
||||
*ver++ = '\0';
|
||||
strcpy (f.pkg, p);
|
||||
strcpy (f.what, strlwr (ver));
|
||||
strcpy (f.pkgtar, p);
|
||||
strcat (f.pkgtar, f.tail);
|
||||
ver = strchr (ver, '\0');
|
||||
break;
|
||||
}
|
||||
|
||||
if (!f.pkg[0])
|
||||
strcpy (f.pkg, p);
|
||||
|
Reference in New Issue
Block a user