Giant const-correctness patch of doom!

[PuTTY.git] / unix / uxpterm.c

diff --git a/unix/uxpterm.c b/unix/uxpterm.c
index c18505bb2d0041eed4f300f55d98ba1167def890..3211d45a54135ac44ef73b8587278b317dd89ff5 100644 (file)
--- a/unix/uxpterm.c
+++ b/unix/uxpterm.c
@@ -17,16 +17,6 @@ Backend *select_backend(Conf *conf)
     return &pty_backend;
 }
 
-void net_pending_errors(void)
-{
-    /*
-     * Stub version of net_pending_errors(), because gtkwin.c has to
-     * be prepared to call it when linked into PuTTY and therefore we
-     * have to avoid a link failure when linking gtkwin.c in turn into
-     * a non-networked application.
-     */
-}
-
 int cfgbox(Conf *conf)
 {
     /*
@@ -43,7 +33,7 @@ void cleanup_exit(int code)
     exit(code);
 }
 
-int process_nonoption_arg(char *arg, Conf *conf, int *allow_launch)
+int process_nonoption_arg(const char *arg, Conf *conf, int *allow_launch)
 {
     return 0;                          /* pterm doesn't have any. */
 }
@@ -57,11 +47,14 @@ int main(int argc, char **argv)
 {
     extern int pt_main(int argc, char **argv);
     extern void pty_pre_init(void);    /* declared in pty.c */
+    int ret;
 
     cmdline_tooltype = TOOLTYPE_NONNETWORK;
     default_protocol = -1;
 
     pty_pre_init();
 
-    return pt_main(argc, argv);
+    ret = pt_main(argc, argv);
+    cleanup_exit(ret);
+    return ret;             /* not reached, but placates optimisers */
 }