summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-04-18 14:38:15 -0500
committerTimothy Pearson <[email protected]>2012-04-18 14:38:15 -0500
commita63606b68664ba56c48bfdb86ef042c836faae66 (patch)
tree78f99cf41b4fcf03162b8cdb2cb618806d015059
parent632eda3b6c6d9aa903e31d3533e8bcb631868d0b (diff)
downloadtdebase-a63606b68664ba56c48bfdb86ef042c836faae66.tar.gz
tdebase-a63606b68664ba56c48bfdb86ef042c836faae66.zip
Ensure that tdm honors SAK setting
Minor cleanup of tdm build warnings
-rw-r--r--tdm/backend/printf.c6
-rw-r--r--tdm/kfrontend/gentdmconf.c4
-rw-r--r--tdm/kfrontend/kgapp.cpp5
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 <pwd.h>
+#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();