libpurple/protocols/oscar/userinfo.c

branch
soc.2013.gobjectification
changeset 35001
85144a4a7942
parent 34868
faa5b053f310
parent 34457
a9d3726c3a8f
child 35989
2b5a26ddbb69
--- a/libpurple/protocols/oscar/userinfo.c	Thu Oct 03 06:46:47 2013 +0530
+++ b/libpurple/protocols/oscar/userinfo.c	Sun Oct 06 18:13:03 2013 +0530
@@ -335,11 +335,11 @@
 
 	if ((bi != NULL) && (bi->ipaddr != 0)) {
 		char tmp2[40];
-		sprintf(tmp2, "%hhu.%hhu.%hhu.%hhu",
-				(bi->ipaddr & 0xff000000) >> 24,
-				(bi->ipaddr & 0x00ff0000) >> 16,
-				(bi->ipaddr & 0x0000ff00) >> 8,
-				(bi->ipaddr & 0x000000ff));
+		sprintf(tmp2, "%u.%u.%u.%u",
+			0xFF & ((bi->ipaddr & 0xff000000) >> 24),
+			0xFF & ((bi->ipaddr & 0x00ff0000) >> 16),
+			0xFF & ((bi->ipaddr & 0x0000ff00) >> 8),
+			0xFF & (bi->ipaddr & 0x000000ff));
 		purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tmp2);
 	}
 
@@ -399,11 +399,11 @@
 	oscar_user_info_convert_and_add(account, od, user_info, _("Nick"), info->nick);
 	if ((bi != NULL) && (bi->ipaddr != 0)) {
 		char tstr[40];
-		sprintf(tstr, "%hhu.%hhu.%hhu.%hhu",
-				(bi->ipaddr & 0xff000000) >> 24,
-				(bi->ipaddr & 0x00ff0000) >> 16,
-				(bi->ipaddr & 0x0000ff00) >> 8,
-				(bi->ipaddr & 0x000000ff));
+		sprintf(tstr, "%u.%u.%u.%u",
+			0xFF & ((bi->ipaddr & 0xff000000) >> 24),
+			0xFF & ((bi->ipaddr & 0x00ff0000) >> 16),
+			0xFF & ((bi->ipaddr & 0x0000ff00) >> 8),
+			0xFF & ((bi->ipaddr & 0x000000ff)));
 		purple_notify_user_info_add_pair_plaintext(user_info, _("IP Address"), tstr);
 	}
 	oscar_user_info_convert_and_add(account, od, user_info, _("First Name"), info->first);

mercurial