callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize a pointer to NULL and cast away a warning. bug #332101. Fix

Browse Source 
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
This commit is contained in:
Kjartan Maraas
2006-10-01 11:49:27 +00:00
committed by Kjartan Maraas
parent 90dfa49bf6
commit 8f0374166d
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
smime/ChangeLog
View File

@ -1,3 +1,10 @@
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.
2006-08-21 Andre Klapper <a9016009@gmx.de>
* smime-ui.glade:

4
smime/lib/e-asn1-object.c
View File

@ -229,7 +229,7 @@ build_from_der (EASN1Object *parent, char *data, char *end)
PRInt32 len;
PRUint32 type;
unsigned char code, tagnum;
EASN1Object *asn1object;
EASN1Object *asn1object = NULL;
if (data >= end)
return TRUE;
@ -254,7 +254,7 @@ build_from_der (EASN1Object *parent, char *data, char *end)
return FALSE;
}
data++;
len = get_der_item_length (data, end, &bytesUsed, &indefinite);
len = get_der_item_length ((unsigned char *)data, (unsigned char *)end, &bytesUsed, &indefinite);
data += bytesUsed;
if ((len < 0) || ((data+len) > end))
return FALSE;

4
smime/lib/e-pkcs12.c
View File

@ -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;
}