nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-10 07:38:06 -05:00
Code Issues Projects Releases Wiki Activity

Move gtkwin.c's cmdline_error() into gtkmain.c.

Browse Source 
Not all gtkwin-based tools use it. Only the ones with one session per
process, which parse a command line describing that session and might
reasonably want to report errors in that command line by writing to
standard error and exiting the program.

In other words, precisely the ones that link in gtkmain.c and not
gtkapp.c. So gtkmain.c is a more sensible place to put that
error-reporting function.
This commit is contained in:
Simon Tatham 2017-11-27 19:40:13 +00:00
parent c99338b750
commit ba55b228a3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
unix/gtkmain.c
View File

@ -298,6 +298,17 @@ static void version(FILE *fp) {
static const char *geometry_string;
void cmdline_error(const char *p, ...)
{
va_list ap;
fprintf(stderr, "%s: ", appname);
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
exit(1);
}
int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
Conf *conf)
{

11
unix/gtkwin.c
View File

@ -3789,17 +3789,6 @@ void modalfatalbox(const char *p, ...)
exit(1);
}
void cmdline_error(const char *p, ...)
{
va_list ap;
fprintf(stderr, "%s: ", appname);
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
exit(1);
}
const char *get_x_display(void *frontend)
{
return gdk_get_display();