From a63606b68664ba56c48bfdb86ef042c836faae66 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 18 Apr 2012 14:38:15 -0500 Subject: Ensure that tdm honors SAK setting Minor cleanup of tdm build warnings --- tdm/backend/printf.c | 6 +++--- tdm/kfrontend/gentdmconf.c | 4 ---- tdm/kfrontend/kgapp.cpp | 5 +++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tdm/backend/printf.c b/tdm/backend/printf.c index d7220642b..90780d510 100644 --- a/tdm/backend/printf.c +++ b/tdm/backend/printf.c @@ -207,7 +207,7 @@ fmtstr( OutCh dopr_outch, void *bp, { int padlen, strln, curcol; #ifdef PRINT_QUOTES - int lastcol; + int lastcol = 0; #endif char ch; @@ -295,9 +295,9 @@ DoPr( OutCh dopr_outch, void *bp, const char *format, va_list args ) void *arptr; #endif unsigned long value; - int radix, min, max, flags, cflags, errn; + int radix = 0, min, max, flags, cflags, errn; #ifdef PRINT_ARRAYS - int arlen; + int arlen = 0; unsigned aridx; char sch; #endif diff --git a/tdm/kfrontend/gentdmconf.c b/tdm/kfrontend/gentdmconf.c index b30a1a965..4605a923a 100644 --- a/tdm/kfrontend/gentdmconf.c +++ b/tdm/kfrontend/gentdmconf.c @@ -945,10 +945,6 @@ static int maxTTY, TTYmask; static void getInitTab( void ) { - File it; - char *p, *eol, *ep; - int tty; - if (maxTTY) return; if (!maxTTY) { diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index 5064d88f0..be61c2fd8 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -65,6 +65,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include +#define TSAK_FIFO_FILE "/tmp/tdesocket-global/tsak" + bool argb_visual_available = false; bool has_twin = false; bool is_themed = false; @@ -198,6 +200,9 @@ kg_main( const char *argv0 ) *tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak"; tsak->start(KProcess::Block, KProcess::AllOutput); } + else { + remove(TSAK_FIFO_FILE); + } if (tsak) { tsak->closeStdin(); tsak->closeStdout(); -- cgit v1.2.1