diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-18 14:38:15 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:06 +0200 |
| commit | 2a0ff52dbaab43dea86e4cbcda31df94b5d59a0a (patch) | |
| tree | ad7166db96c32da25bbba02d24db2527cd865207 /kdm | |
| parent | 8cbe82fbc11b1fabeed25107d5f768bd5c53e754 (diff) | |
| download | tdebase-2a0ff52dbaab43dea86e4cbcda31df94b5d59a0a.tar.gz tdebase-2a0ff52dbaab43dea86e4cbcda31df94b5d59a0a.zip | |
Ensure that kdm honors SAK setting
Minor cleanup of kdm build warnings
(cherry picked from commit a63606b68664ba56c48bfdb86ef042c836faae66)
Diffstat (limited to 'kdm')
| -rw-r--r-- | kdm/backend/printf.c | 6 | ||||
| -rw-r--r-- | kdm/kfrontend/genkdmconf.c | 4 | ||||
| -rw-r--r-- | kdm/kfrontend/kgapp.cpp | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/kdm/backend/printf.c b/kdm/backend/printf.c index d7220642b..90780d510 100644 --- a/kdm/backend/printf.c +++ b/kdm/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/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c index bfbeda32a..635a38ee0 100644 --- a/kdm/kfrontend/genkdmconf.c +++ b/kdm/kfrontend/genkdmconf.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/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index 83d88c64a..773a0bf5b 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/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/ksocket-global/tsak" + bool argb_visual_available = false; bool has_kwin = 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(); |