summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-10 11:13:33 (UTC)
committer zecke <zecke>2004-09-10 11:13:33 (UTC)
commit046bff8abb6727f5522748a2dc8a259d27b5979b (patch) (unidiff)
tree9c5443ce219fe07fd24aca16ed8df7643c716c49
parent532d65f8a45850bfda3c3344a7b165af91e48440 (diff)
downloadopie-046bff8abb6727f5522748a2dc8a259d27b5979b.zip
opie-046bff8abb6727f5522748a2dc8a259d27b5979b.tar.gz
opie-046bff8abb6727f5522748a2dc8a259d27b5979b.tar.bz2
Fix unused global variables, unused code, unused parameters, sign != unsigned
tests...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/comm/keypebble/d3des.c7
-rw-r--r--noncore/comm/keypebble/krfbcanvas.cpp8
-rw-r--r--noncore/comm/keypebble/kvnc.cpp2
-rw-r--r--noncore/comm/keypebble/vncauth.c2
4 files changed, 7 insertions, 12 deletions
diff --git a/noncore/comm/keypebble/d3des.c b/noncore/comm/keypebble/d3des.c
index b0f065e..7f50da4 100644
--- a/noncore/comm/keypebble/d3des.c
+++ b/noncore/comm/keypebble/d3des.c
@@ -24,31 +24,24 @@
24 * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge. 24 * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge.
25 * (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992. 25 * (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992.
26 */ 26 */
27 27
28#include "d3des.h" 28#include "d3des.h"
29 29
30static void scrunch(unsigned char *, unsigned long *); 30static void scrunch(unsigned char *, unsigned long *);
31static void unscrun(unsigned long *, unsigned char *); 31static void unscrun(unsigned long *, unsigned char *);
32static void desfunc(unsigned long *, unsigned long *); 32static void desfunc(unsigned long *, unsigned long *);
33static void cookey(unsigned long *); 33static void cookey(unsigned long *);
34 34
35static unsigned long KnL[32] = { 0L }; 35static unsigned long KnL[32] = { 0L };
36static unsigned long KnR[32] = { 0L };
37static unsigned long Kn3[32] = { 0L };
38static unsigned char Df_Key[24] = {
39 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,
40 0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
41 0x89,0xab,0xcd,0xef,0x01,0x23,0x45,0x67 };
42
43 static unsigned short bytebit[8]= { 36 static unsigned short bytebit[8]= {
44 01, 02, 04, 010, 020, 040, 0100, 0200 }; 37 01, 02, 04, 010, 020, 040, 0100, 0200 };
45 38
46static unsigned long bigbyte[24] = { 39static unsigned long bigbyte[24] = {
47 0x800000L, 0x400000L, 0x200000L,0x100000L, 40 0x800000L, 0x400000L, 0x200000L,0x100000L,
48 0x80000L, 0x40000L, 0x20000L,0x10000L, 41 0x80000L, 0x40000L, 0x20000L,0x10000L,
49 0x8000L, 0x4000L, 0x2000L,0x1000L, 42 0x8000L, 0x4000L, 0x2000L,0x1000L,
50 0x800L, 0x400L, 0x200L, 0x100L, 43 0x800L, 0x400L, 0x200L, 0x100L,
51 0x80L, 0x40L, 0x20L, 0x10L, 44 0x80L, 0x40L, 0x20L, 0x10L,
52 0x8L, 0x4L, 0x2L, 0x1L}; 45 0x8L, 0x4L, 0x2L, 0x1L};
53 46
54/* Use the key schedule specified in the Standard (ANSI X3.92-1981). */ 47/* Use the key schedule specified in the Standard (ANSI X3.92-1981). */
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp
index b3525df..d5b8ce7 100644
--- a/noncore/comm/keypebble/krfbcanvas.cpp
+++ b/noncore/comm/keypebble/krfbcanvas.cpp
@@ -27,40 +27,42 @@ KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name )
27 nextRightClick=0; 27 nextRightClick=0;
28 nextDoubleClick=0; 28 nextDoubleClick=0;
29} 29}
30 30
31KRFBCanvas::~KRFBCanvas() 31KRFBCanvas::~KRFBCanvas()
32{ 32{
33} 33}
34 34
35 35
36void KRFBCanvas::openConnection(KRFBServer server) 36void KRFBCanvas::openConnection(KRFBServer server)
37{ 37{
38 38
39 39
40 QCString host = server.hostname.latin1(); 40 QCString host = server.hostname.latin1();
41 password=server.password; 41 password=server.password;
42 connection_->connectTo( server); 42 connection_->connectTo( server);
43} 43}
44 44
45 45
46void KRFBCanvas::openURL( const QUrl &url ) 46void KRFBCanvas::openURL( const QUrl &url )
47{ 47{
48 if ( loggedIn_ ) { 48 if ( loggedIn_ ) {
49 owarn << "openURL invoked when logged in\n" << oendl; 49 owarn << "openURL invoked when logged in\n" << oendl;
50 return; 50 return;
51 } 51 }
52 52
53 QCString host = url.host().latin1(); 53 QCString host = url.host().latin1();
54 int display = url.port(); 54 int display = url.port();
55 Q_UNUSED( host )
56 Q_UNUSED( display )
55 57
56// connection_->connectTo( host, display ); 58// connection_->connectTo( host, display );
57} 59}
58 60
59void KRFBCanvas::closeConnection() 61void KRFBCanvas::closeConnection()
60{ 62{
61 loggedIn_ = false; 63 loggedIn_ = false;
62 connection_->disconnect(); 64 connection_->disconnect();
63 65
64 viewport()->setMouseTracking( false ); 66 viewport()->setMouseTracking( false );
65 viewport()->setBackgroundMode( PaletteDark ); 67 viewport()->setBackgroundMode( PaletteDark );
66 setBackgroundMode( PaletteDark ); 68 setBackgroundMode( PaletteDark );
@@ -69,25 +71,25 @@ void KRFBCanvas::closeConnection()
69 71
70 72
71void KRFBCanvas::bell() 73void KRFBCanvas::bell()
72{ 74{
73 if ( connection_->options()->deIconify ) { 75 if ( connection_->options()->deIconify ) {
74 topLevelWidget()->raise(); 76 topLevelWidget()->raise();
75 topLevelWidget()->show(); 77 topLevelWidget()->show();
76 } 78 }
77} 79}
78 80
79void KRFBCanvas::loggedIn() 81void KRFBCanvas::loggedIn()
80{ 82{
81 owarn << "Ok, we're logged in" << oendl; 83 owarn << "Ok, we're logged in" << oendl;
82 84
83 // 85 //
84 // Get ready for action 86 // Get ready for action
85 // 87 //
86 loggedIn_ = true; 88 loggedIn_ = true;
87 viewport()->setMouseTracking( true ); 89 viewport()->setMouseTracking( true );
88 viewport()->setBackgroundMode( NoBackground ); 90 viewport()->setBackgroundMode( NoBackground );
89 setBackgroundMode( NoBackground ); 91 setBackgroundMode( NoBackground );
90 92
91 // Start using the buffer 93 // Start using the buffer
92 connect( connection_->buffer(), SIGNAL( sizeChanged(int,int) ), 94 connect( connection_->buffer(), SIGNAL( sizeChanged(int,int) ),
93 this, SLOT( resizeContents(int,int) ) ); 95 this, SLOT( resizeContents(int,int) ) );
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 88cb50b..3a8e919 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -34,25 +34,25 @@ static char * menu_xpm[] = {
34" .+++++++. ", 34" .+++++++. ",
35" .+@@@@#. ", 35" .+@@@@#. ",
36" .+@@@#. ", 36" .+@@@#. ",
37" .+@@#. ", 37" .+@@#. ",
38" .+@#. ", 38" .+@#. ",
39" .+#. ", 39" .+#. ",
40" .+. ", 40" .+. ",
41" .. ", 41" .. ",
42" "}; 42" "};
43 43
44const int StatusTextId = 0; 44const int StatusTextId = 0;
45 45
46KVNC::KVNC( QWidget *parent, const char *name, WFlags f) : QMainWindow( 0, name ,WStyle_ContextHelp) 46KVNC::KVNC( QWidget *parent, const char *name, WFlags ) : QMainWindow( parent, name ,WStyle_ContextHelp)
47{ 47{
48 setCaption( tr("VNC Viewer") ); 48 setCaption( tr("VNC Viewer") );
49 fullscreen = false; 49 fullscreen = false;
50 50
51 stack = new QWidgetStack( this ); 51 stack = new QWidgetStack( this );
52 setCentralWidget( stack ); 52 setCentralWidget( stack );
53 53
54 bookmarkSelector=new KVNCBookmarkDlg(); 54 bookmarkSelector=new KVNCBookmarkDlg();
55 stack->addWidget(bookmarkSelector,get_unique_id()); 55 stack->addWidget(bookmarkSelector,get_unique_id());
56 stack->raiseWidget( bookmarkSelector ); 56 stack->raiseWidget( bookmarkSelector );
57 57
58 canvas = new KRFBCanvas( stack, "canvas" ); 58 canvas = new KRFBCanvas( stack, "canvas" );
diff --git a/noncore/comm/keypebble/vncauth.c b/noncore/comm/keypebble/vncauth.c
index dc276bf..277d145 100644
--- a/noncore/comm/keypebble/vncauth.c
+++ b/noncore/comm/keypebble/vncauth.c
@@ -40,25 +40,25 @@
40unsigned char fixedkey[8] = {23,82,107,6,35,78,88,7}; 40unsigned char fixedkey[8] = {23,82,107,6,35,78,88,7};
41 41
42 42
43/* 43/*
44 * Encrypt a password and store it in a file. Returns 0 if successful, 44 * Encrypt a password and store it in a file. Returns 0 if successful,
45 * 1 if the file could not be written. 45 * 1 if the file could not be written.
46 */ 46 */
47 47
48int 48int
49vncEncryptAndStorePasswd(char *passwd, char *fname) 49vncEncryptAndStorePasswd(char *passwd, char *fname)
50{ 50{
51 FILE *fp; 51 FILE *fp;
52 int i; 52 uint i;
53 unsigned char encryptedPasswd[8]; 53 unsigned char encryptedPasswd[8];
54 54
55 if ((fp = fopen(fname,"w")) == NULL) return 1; 55 if ((fp = fopen(fname,"w")) == NULL) return 1;
56 56
57 chmod(fname, S_IRUSR|S_IWUSR); 57 chmod(fname, S_IRUSR|S_IWUSR);
58 58
59 /* pad password with nulls */ 59 /* pad password with nulls */
60 60
61 for (i = 0; i < 8; i++) { 61 for (i = 0; i < 8; i++) {
62 if (i < strlen(passwd)) { 62 if (i < strlen(passwd)) {
63 encryptedPasswd[i] = passwd[i]; 63 encryptedPasswd[i] = passwd[i];
64 } else { 64 } else {