[Winpt-commits] r69 - trunk/Src

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Sat Nov 5 13:28:17 CET 2005


Author: twoaday
Date: 2005-11-05 13:28:12 +0100 (Sat, 05 Nov 2005)
New Revision: 69

Modified:
   trunk/Src/wptCardEdit.cpp
   trunk/Src/wptFileManager.cpp
   trunk/Src/wptGPG.cpp
   trunk/Src/wptGPGParser.cpp
   trunk/Src/wptHotkey.cpp
   trunk/Src/wptKeyCache.cpp
   trunk/Src/wptKeyEdit.cpp
   trunk/Src/wptNLS.c
   trunk/Src/wptPassphraseCB.cpp
   trunk/Src/wptRegistry.cpp
   trunk/Src/wptSigList.cpp
Log:
More minor fixes...


Modified: trunk/Src/wptCardEdit.cpp
===================================================================
--- trunk/Src/wptCardEdit.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptCardEdit.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -130,7 +130,7 @@
 	CARD_Fpr,
 	CARD_FprTime
     };
-    enum rectype_t rectype;    
+    enum rectype_t rectype = (rectype_t)0;
     char *p, *pend;
     int field = 0;
 
@@ -292,7 +292,9 @@
 	    if (!card->fpr_created_str[field-2])
 		return gpg_error (GPG_ERR_ENOMEM);
 	    break;
-
+	    
+	default:
+	    break;
 	}
     }
     return 0;
@@ -375,32 +377,32 @@
 
 /* Set the user PIN for the object to @pin. */
 void
-GpgCardEdit::setPIN (const char *pin)
+GpgCardEdit::setPIN (const char *_pin)
 {
-    this->pin = pin;
+    this->pin = _pin;
 }
 
 /* Set the admin PIN for the object to @admin_pin. */
 void
-GpgCardEdit::setAdminPIN (const char *admin_pin)
+GpgCardEdit::setAdminPIN (const char *_admin_pin)
 {
-    this->admin_pin = admin_pin;
+    this->admin_pin = _admin_pin;
 }
 
 
 /* Set the new user PIN for the object to @new_pin. */
 void 
-GpgCardEdit::setNewPIN (const char *new_pin)
+GpgCardEdit::setNewPIN (const char *_new_pin)
 {
-    this->pin_new = new_pin;
+    this->pin_new = _new_pin;
 }
 
 
 /* Set the passphrase needed when generating a key to @pass. */
 void
-GpgCardEdit::setKeygenPassphrase (const char *pass)
+GpgCardEdit::setKeygenPassphrase (const char *_pass)
 {
-    this->keygen.pass = pass;
+    this->keygen.pass = _pass;
 }
 
 
@@ -516,14 +518,14 @@
 /* Change the pin from @pin to @pin_new.
    Return value: 0 on success. */
 gpgme_error_t 
-GpgCardEdit::changePIN (int type)
+GpgCardEdit::changePIN (int _type)
 {
     gpgme_error_t err;
 
     if (!this->pin_new)
 	return gpg_error (GPG_ERR_INV_ARG);
 
-    if (!type) {
+    if (!_type) {
 	if (this->pin && this->pin_new)
 	    this->type = GPG_EDITCARD_CHUPIN;
 	else if (this->pin && this->admin_pin)
@@ -532,7 +534,7 @@
 	    this->type = GPG_EDITCARD_UNBPIN;
     }
     else
-	this->type = type;
+	this->type = _type;
     /* check if the user provided the needed PIN. */
     if ((this->type == GPG_EDITCARD_CHUPIN && !this->pin) ||
 	(this->type == GPG_EDITCARD_CHAPIN && !this->admin_pin))
@@ -560,7 +562,7 @@
 }
     
 gpgme_error_t
-GpgCardEdit::updateURL (const char *url)
+GpgCardEdit::updateURL (const char *_url)
 {
     gpgme_error_t err;
 
@@ -568,7 +570,7 @@
 	return gpg_error (GPG_ERR_INV_OBJ);
 
     type = GPG_EDITCARD_KEYURL;
-    this->edit.keyurl = url;
+    this->edit.keyurl = _url;
 
     err = gpg_card_edit (ctx, this);
     return err;
@@ -626,8 +628,6 @@
 gpgme_error_t
 GpgCardEdit::fetchKey (void)
 {
-    gpgme_error_t err = 0;
-
     if (!this->pin)
 	return gpg_error (GPG_ERR_INV_OBJ);
 

Modified: trunk/Src/wptFileManager.cpp
===================================================================
--- trunk/Src/wptFileManager.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptFileManager.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -282,7 +282,7 @@
     armor_filter_context_t afx;
     PACKET *pkt;
     const char *s = NULL;
-    int i = 0, rc = 0;
+    int rc=0;
 
     if (r_type)
 	*r_type = PGP_NONE;
@@ -339,6 +339,9 @@
 	    s = "SECKEY";   rc = -2;
 	    if (r_type) *r_type = PGP_SECKEY;
 	    break;
+	    
+	default:
+	    break;
 	}
 	gpg_free_packet (pkt);
 	gpg_init_packet (pkt);
@@ -501,7 +504,8 @@
 fm_add_dropped_files (listview_ctrl_t lv, HDROP dd_files)
 {
     char name[384+4];
-    int nfiles, rc, i;
+    int nfiles, i;
+    int rc=0;
     
     memset (name, 0, sizeof (name));
     nfiles = DragQueryFile (dd_files, 0xFFFFFFFF, NULL, 0);
@@ -1013,7 +1017,7 @@
     gpgme_ctx_t ctx = c->ctx;
     file_data_t in=NULL, out=NULL;
     char *keyid = NULL, ext[5];
-    int no_compr = 0;
+    /*int no_compr = 0;*/
     int rc = 0;
 
     c->output = new char[strlen (name) + 5 + 1];
@@ -1123,7 +1127,6 @@
     gpgme_error_t err;    
     file_data_t in=NULL, out=NULL;
     int rc = 0, cancel = 0;
-    char * src = NULL, * dst = NULL;
     char ext[5], * pass;    
     
     pass = request_passphrase2 (_("Symmetric"), 0, &cancel);
@@ -1234,7 +1237,6 @@
     gpgme_decrypt_result_t res;
     gpgme_verify_result_t sigres;
     file_data_t in =NULL, out=NULL;
-    int is_signed = 0;
     int rc = 0;
     
     if (!c->init_cb || !c->cache_cb) {
@@ -1387,7 +1389,6 @@
 {
     gpgme_key_t key;    
     const char *kid;
-    int not_found = 0;
 
     kid = log->sig->fpr;
     if (!kid)
@@ -1640,12 +1641,12 @@
 int
 fm_export (fm_state_t c)
 {
-    int rc = 0, id = 0;
+    int rc = 0;
     gpgme_ctx_t ctx = c->ctx;
     gpgme_error_t err;
     gpgme_key_t *rset = c->recp;
     file_data_t keydata = NULL;
-    const char *name, *s = NULL;
+    const char *name;
     char *p = NULL, *patt = NULL;
 
     if (!rset || !rset[0]) {

Modified: trunk/Src/wptGPG.cpp
===================================================================
--- trunk/Src/wptGPG.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptGPG.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -177,7 +177,6 @@
 {    
     char *p;
     char *pgm = NULL;
-    size_t nlen = 0;
 
     p = get_reg_entry_gpg ("gpgProgram");
     if (!p) {
@@ -854,7 +853,7 @@
 {	
     char *homedir = NULL;
     char *prog = NULL;
-    int rc = 0, ec = 0;
+    int rc = 0;
     
     rc = check_homedir ();
     if (rc)

Modified: trunk/Src/wptGPGParser.cpp
===================================================================
--- trunk/Src/wptGPGParser.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptGPGParser.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -282,7 +282,6 @@
     gpg_option_t e;
     gpg_group_t g;
     gpg_member_t m;
-    int rc = 0;
 
     inp = fopen (file, "w+b");
     if( !inp )

Modified: trunk/Src/wptHotkey.cpp
===================================================================
--- trunk/Src/wptHotkey.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptHotkey.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -92,7 +92,8 @@
 int
 hotkey_register_single (HWND wnd, hotkey_t hk)
 {
-    int rc, keymod;
+    int keymod=0;
+    int rc;
 
     if (!hk->enabled)
 	return 0;

Modified: trunk/Src/wptKeyCache.cpp
===================================================================
--- trunk/Src/wptKeyCache.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptKeyCache.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -36,6 +36,7 @@
 #include "wptW32API.h"
 
 
+#if 0
 /* convert a binary buffer into its hex representation. */
 static void
 buffer_to_string (char *dst, size_t dlen, const byte *buf, size_t nbytes)
@@ -50,8 +51,8 @@
 	dlen -= 2;
     }
 }
+#endif
 
-
 /* Parse the secret keyring and retrieve some additional information
    for each key which was found. */
 static void
@@ -104,7 +105,7 @@
 keycache_prepare2 (gpg_keycache_t ctx, const char *kid,
  	           const char *pubring, const char *secring)
 {
-    gpgme_error_t err;
+    gpgme_error_t err = gpg_error (GPG_ERR_NO_ERROR);
     gpgme_key_t key = NULL;
     gpg_iobuf_t inp;
     PACKET *pkt = (PACKET*)calloc (1, sizeof * pkt);
@@ -175,15 +176,15 @@
 	}
 	if ((pkt->pkttype == PKT_USER_ID || pkt->pkttype == PKT_ATTRIBUTE)
 	    && pkt->pkt.user_id->attrib_data && key) {
-	    PKT_user_id *id = pkt->pkt.user_id;
+	    PKT_user_id *uid = pkt->pkt.user_id;
 	    c->attrib.used = 1;
-	    c->attrib.len = id->attrib_len;
-	    c->attrib.d = (unsigned char*)calloc (1, id->attrib_len + 1);
+	    c->attrib.len = uid->attrib_len;
+	    c->attrib.d = (unsigned char*)calloc (1, uid->attrib_len + 1);
 	    if (!c->attrib.d) {
 		err = gpg_error (GPG_ERR_ENOMEM);
 		goto fail;
 	    }
-	    memcpy (c->attrib.d, id->attrib_data, id->attrib_len);
+	    memcpy (c->attrib.d, uid->attrib_data, uid->attrib_len);
 	    key = NULL;
 	    c = NULL;
 	}

Modified: trunk/Src/wptKeyEdit.cpp
===================================================================
--- trunk/Src/wptKeyEdit.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptKeyEdit.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -339,9 +339,9 @@
 }
 
 /* Construct an object and fetch the key with the keyid @keyid. */
-GpgKeyEdit::GpgKeyEdit (const char *keyid)
+GpgKeyEdit::GpgKeyEdit (const char *_keyid)
 {
-    get_pubkey (keyid, &this->key);
+    get_pubkey (_keyid, &this->key);
     pass = NULL;
     type = 0;
     name = NULL;
@@ -396,25 +396,25 @@
 
 /* Set the passphrase to @pass. */
 void 
-GpgKeyEdit::setPassphrase (const char *pass)
+GpgKeyEdit::setPassphrase (const char *_pass)
 {
-    this->pass = pass;
+    this->pass = _pass;
 }
 
 /* Set the current key to @key. */
 void 
-GpgKeyEdit::setKey (gpgme_key_t key)
+GpgKeyEdit::setKey (gpgme_key_t _key)
 {
-    this->key = key;
+    this->key = _key;
 }
 
 /* Set the keyid of the destination key to @keyid. */
 void
-GpgKeyEdit::setKeyID (const char *keyid)
+GpgKeyEdit::setKeyID (const char *_keyid)
 {
-    if (!keyid)
+    if (!_keyid)
 	return;
-    get_pubkey (keyid, &this->key);
+    get_pubkey (_keyid, &this->key);
 }
 
 
@@ -452,17 +452,18 @@
    signing mode @mode and the signature class @sig_class.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::signKey (int mode, int sig_class, const char *exp_date)
+GpgKeyEdit::signKey (int mode, int _sig_class, const char *_exp_date)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
 
     type = mode;
-    this->exp_date = exp_date;
-    this->sig_class = sig_class;
+    this->exp_date = _exp_date;
+    this->sig_class = _sig_class;
     return gpg_editkey (this->ctx, this->key, this);
 }
 
+
 /* Set the ownertrust of the key stored in the object
    to the trust value @trust.
    Return value: 0 on success. */
@@ -503,26 +504,26 @@
 /* Delete the user-ID with the index @uid_index of the given key.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::delUserid (int uid_index)
+GpgKeyEdit::delUserid (int _uid_index)
 {
     if (!this->key)
 	return gpg_error (GPG_ERR_INV_OBJ);
 
     type = GPG_EDITKEY_DELUID;
-    this->uid_index = uid_index;
+    this->uid_index = _uid_index;
     return gpg_editkey (this->ctx, this->key, this);
 }
 
 /* Delete the subkey with the index @key_index.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::delKey (int key_index)
+GpgKeyEdit::delKey (int _key_index)
 {
     if (!this->key)
 	return gpg_error (GPG_ERR_INV_OBJ);
 
     type = GPG_EDITKEY_DELKEY;
-    this->key_index = key_index;
+    this->key_index = _key_index;
     return gpg_editkey (this->ctx, this->key, this);
 }
 
@@ -549,13 +550,13 @@
    If allow_empty != 0, it is allowed to provide an empty passphrase.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::changePassphrase (const char *new_pass, int allow_empty)
+GpgKeyEdit::changePassphrase (const char *_new_pass, int allow_empty)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
     
     type = GPG_EDITKEY_PASSWD;
-    this->new_pass = new_pass;
+    this->new_pass = _new_pass;
     this->flags = allow_empty? 1 : 0;
     return gpg_editkey (this->ctx, this->key, this);
 }
@@ -564,13 +565,13 @@
    the index @uid_index.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::setPrimaryUserid (int uid_index)
+GpgKeyEdit::setPrimaryUserid (int _uid_index)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
 
     type = GPG_EDITKEY_PRIMARY;
-    this->uid_index = uid_index;
+    this->uid_index = _uid_index;
     return gpg_editkey (this->ctx, this->key, this);
 }
 
@@ -579,7 +580,8 @@
    if @exp_days is true, exp_timestamp is already converted to days.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::setKeyExpireDate (int key_index, long exp_timestamp, bool exp_days)
+GpgKeyEdit::setKeyExpireDate (int _key_index, 
+			      long exp_timestamp, bool exp_days)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
@@ -593,20 +595,20 @@
     }
     else
 	valid = exp_timestamp;
-    this->key_index = key_index;
+    this->key_index = _key_index;
     return gpg_editkey (this->ctx, this->key, this);
 }
 
 /* Revoke the userid given by the index @uid_index.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::revokeUserid (int uid_index)
+GpgKeyEdit::revokeUserid (int _uid_index)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
 
     type = GPG_EDITKEY_REVUID;
-    this->uid_index = uid_index;
+    this->uid_index = _uid_index;
     return gpg_editkey (this->ctx, this->key, this);
 }
 
@@ -615,14 +617,14 @@
    and the signature index @sig_index.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::revokeSignature (int uid_index, int sig_index)
+GpgKeyEdit::revokeSignature (int _uid_index, int _sig_index)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
 
     type = GPG_EDITKEY_REVSIG;
-    this->uid_index = uid_index;
-    this->sig_index = sig_index;
+    this->uid_index = _uid_index;
+    this->sig_index = _sig_index;
     return gpg_editkey (this->ctx, this->key, this);
 }
 
@@ -632,18 +634,18 @@
    more details in @cmt.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::revokeSubkey (int key_index, int reason, const char *cmt)
+GpgKeyEdit::revokeSubkey (int _key_index, int _reason, const char *_cmt)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
 
     type = GPG_EDITKEY_REVKEY;
-    this->key_index = key_index;
-    this->reason = reason;
+    this->key_index = _key_index;
+    this->reason = _reason;
     free_if_alloc (this->cmt);
     this->cmt = NULL;
-    if (cmt)
-	this->cmt = m_strdup (cmt);
+    if (_cmt)
+	this->cmt = m_strdup (_cmt);
     return gpg_editkey (this->ctx, this->key, this);
 }
 
@@ -703,7 +705,7 @@
    index @uid_index to the prefs given in @new_prefs.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::setUseridPreferences (int uid_index, const char *new_prefs)
+GpgKeyEdit::setUseridPreferences (int _uid_index, const char *new_prefs)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
@@ -715,27 +717,27 @@
    The index of the signature is given in @sig_index.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::delUseridSignature (int uid_index, int sig_index)
+GpgKeyEdit::delUseridSignature (int _uid_index, int _sig_index)
 {
     if (!this->key)
 	return gpg_error (GPG_ERR_INV_OBJ);
     type = GPG_EDITKEY_DELSIG;
-    this->uid_index = uid_index;
-    this->sig_index = sig_index;
+    this->uid_index = _uid_index;
+    this->sig_index = _sig_index;
     return gpg_editkey (this->ctx, this->key, this);
 }
 
 /* Set the preferred keyserver for the given key to @url.
    Return value: 0 on success. */
 gpgme_error_t
-GpgKeyEdit::setPreferredKeyserver (int uid_index, const char *url)
+GpgKeyEdit::setPreferredKeyserver (int _uid_index, const char *_url)
 {
     if (!this->key || !this->pass)
 	return gpg_error (GPG_ERR_INV_OBJ);
     if (!url)
 	return gpg_error (GPG_ERR_INV_ARG);
     type = GPG_EDITKEY_KEYSERV;
-    this->url = url;
-    this->uid_index = uid_index;
+    this->url = _url;
+    this->uid_index = _uid_index;
     return gpg_editkey (this->ctx, this->key, this);
 }

Modified: trunk/Src/wptNLS.c
===================================================================
--- trunk/Src/wptNLS.c	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptNLS.c	2005-11-05 12:28:12 UTC (rev 69)
@@ -19,7 +19,6 @@
  * along with WinPT; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
  */
-/* x-todo-status: OK */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -37,17 +36,17 @@
 #include "wptTypes.h"
 #include "wptNLS.h"
 
-
 /* Missing W32 functions. */
 static char *
-stpcpy( char *a,const char *b )
+w32_stpcpy (char *a,const char *b)
 {
-    while( *b )
+    while (*b)
 	*a++ = *b++;
     *a = 0;
     return (char*)a;
 }
 
+
 /* The magic number of the GNU message catalog format.	*/
 #define MAGIC	      0x950412de
 #define MAGIC_SWAPPED 0xde120495
@@ -239,7 +238,7 @@
 		
 	    dir = strdup( nls_dir );
 	    if( dir && (buf= (char *)malloc(strlen(dir)+strlen(filename)+1+3+1)) ) {
-		strcpy(stpcpy(stpcpy(stpcpy( buf, dir),"/"), filename),".mo");
+		strcpy(w32_stpcpy(w32_stpcpy(w32_stpcpy( buf, dir),"/"), filename),".mo");
 		domain = load_domain( buf );			
 		free(buf);
 	    }

Modified: trunk/Src/wptPassphraseCB.cpp
===================================================================
--- trunk/Src/wptPassphraseCB.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptPassphraseCB.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -68,11 +68,11 @@
 passphrase_callback_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
 {    
     static passphrase_cb_s * c;
-    gpgme_decrypt_result_t res;
-    gpgme_sign_result_t res_sig;
+    gpgme_decrypt_result_t res = NULL;
+    gpgme_sign_result_t res_sig = NULL;
     gpgme_key_t key;
-    gpgme_recipient_t recip, r;
-    void *ctx = NULL, *item;
+    gpgme_recipient_t recip=NULL, r;
+    void *item;
     const char *id;
     char *info;
     int n;
@@ -257,6 +257,7 @@
     char *uid, *p;
     int n=0;
 
+    algo = (gpgme_pubkey_algo_t)0;
     /* Each uid_hint contains a long key-ID so it is at least 16 bytes. */
     if (strlen (uid_hint) < 17) {
 	*desc = 0;
@@ -316,9 +317,9 @@
     passphrase_cb_s *c = (passphrase_cb_s*)hook;
     HANDLE hd = (HANDLE)fd;
     void *item;
-    const char *keyid, *pass;
+    const char *keyid=NULL, *pass;
     DWORD n;
-    int rc;
+    int rc=0;
 
     if (!c)
 	return gpg_error (GPG_ERR_INV_ARG);
@@ -334,13 +335,13 @@
 	if (strlen (passphrase_info) < 16 && 
 	    !strstr (passphrase_info, "OPENPGP")) {
 	    /* assume symetric encryption. */
-	    int n=2;
+	    int pos=2;
 	    c->sym.sym_algo = atoi (passphrase_info);
 	    if (c->sym.sym_algo > 9)
-		n++;
+		pos++;
 	    /* XXX: be more strict. */
-	    c->sym.s2k_mode = atoi (passphrase_info+n);
-	    c->sym.s2k_hash = atoi (passphrase_info+n+2);
+	    c->sym.s2k_mode = atoi (passphrase_info+pos);
+	    c->sym.s2k_hash = atoi (passphrase_info+pos+2);
 	}
 
 	keyid = parse_gpg_keyid (passphrase_info);

Modified: trunk/Src/wptRegistry.cpp
===================================================================
--- trunk/Src/wptRegistry.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptRegistry.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -44,15 +44,15 @@
 };
 
 struct reg_hotkey_s reg_hotkeys[] = {
-    {"ClipEncrypt", NULL, 0},
-    {"ClipDecrypt", NULL, 0},
-    {"ClipSign",    NULL, 0},
-    {"ClipSignEnc", NULL, 0},
-    {"CwsEncrypt",  NULL, 0},
-    {"CwsDecrypt",  NULL, 0},
-    {"CwsSign",     NULL, 0},
-    {"CwsSignEnc",  NULL, 0},
-    {NULL, NULL, 0}
+    {"ClipEncrypt", "", 0},
+    {"ClipDecrypt", "", 0},
+    {"ClipSign",    "", 0},
+    {"ClipSignEnc", "", 0},
+    {"CwsEncrypt",  "", 0},
+    {"CwsDecrypt",  "", 0},
+    {"CwsSign",     "", 0},
+    {"CwsSignEnc",  "", 0},
+    {NULL, "", 0}
 };
 
 winpt_reg_prefs_s reg_prefs;
@@ -277,9 +277,9 @@
 {
     int rc;
     char text[384] = {0};
-    DWORD nbytes, type, n1 = 0;
+    DWORD nbytes, type;
     HKEY reg_key = NULL;
-    char * p = NULL, * tmp = NULL;
+    char *p = NULL;
     
     rc = RegOpenKeyEx (root_key, dir, 0, KEY_QUERY_VALUE, &reg_key);
     if( !rc_ok( rc ) )

Modified: trunk/Src/wptSigList.cpp
===================================================================
--- trunk/Src/wptSigList.cpp	2005-11-05 12:00:55 UTC (rev 68)
+++ trunk/Src/wptSigList.cpp	2005-11-05 12:28:12 UTC (rev 69)
@@ -197,7 +197,7 @@
     gpgme_user_id_t u;
     gpgme_key_sig_t s;
     listview_ctrl_t lv;
-    int rc, i=0;
+    int rc;
 
     if (siglist_build (&lv, ctrl))
 	BUG (NULL);



More information about the Winpt-commits mailing list