aboutsummaryrefslogtreecommitdiffstats
path: root/smime/lib/e-pkcs12.c
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2006-10-01 19:49:27 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2006-10-01 19:49:27 +0800
commit8f0374166d477e9ee2d64ee7bfe75b537fb5382a (patch)
tree157ef18da7f47ffd5ebd67f1cbe3d712495eb4ee /smime/lib/e-pkcs12.c
parent90dfa49bf6a4c4a5f27de7bd53bcbe4d9bf21eaa (diff)
downloadgsoc2013-evolution-8f0374166d477e9ee2d64ee7bfe75b537fb5382a.tar
gsoc2013-evolution-8f0374166d477e9ee2d64ee7bfe75b537fb5382a.tar.gz
gsoc2013-evolution-8f0374166d477e9ee2d64ee7bfe75b537fb5382a.tar.bz2
gsoc2013-evolution-8f0374166d477e9ee2d64ee7bfe75b537fb5382a.tar.lz
gsoc2013-evolution-8f0374166d477e9ee2d64ee7bfe75b537fb5382a.tar.xz
gsoc2013-evolution-8f0374166d477e9ee2d64ee7bfe75b537fb5382a.tar.zst
gsoc2013-evolution-8f0374166d477e9ee2d64ee7bfe75b537fb5382a.zip
Initialize a pointer to NULL and cast away a warning. bug #332101. Fix
2006-10-01 Kjartan Maraas <kmaraas@gnome.org> * lib/e-asn1-object.c: (build_from_der): Initialize a pointer to NULL and cast away a warning. bug #332101. * lib/e-pkcs12.c: (prompt_for_password), (nickname_collision): Fix some signed/unsigned warnings. bug #332101. svn path=/trunk/; revision=32840
Diffstat (limited to 'smime/lib/e-pkcs12.c')
-rw-r--r--smime/lib/e-pkcs12.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 6830b69df3..be5d16138a 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -226,7 +226,7 @@ prompt_for_password (char *title, char *prompt, SECItem *pwd)
if (passwd) {
size_t len = strlen (passwd);
const char *inptr = passwd;
- char *outptr;
+ unsigned char *outptr;
gunichar2 c;
SECITEM_AllocItem(NULL, pwd, sizeof (gunichar2) * (len + 1));
@@ -414,7 +414,7 @@ nickname_collision(SECItem *oldNick, PRBool *cancel, void *wincx)
new_nick = PR_Malloc (sizeof (SECItem));
new_nick->type = siAsciiString;
- new_nick->data = nickname;
+ new_nick->data = (unsigned char *)nickname;
new_nick->len = strlen((char*)new_nick->data);
return new_nick;
}