Sophie

Sophie

distrib > Mandriva > 2009.1 > x86_64 > media > main-testing-src > by-pkgid > 64dbea9f260a4d1012d104daf414c40a > files > 2

gnokii-0.6.27-3.1mdv2009.1.src.rpm

Index: gnokii-0.6.27/common/phones/atgen.c
===================================================================
--- gnokii-0.6.27/common/phones/atgen.c
+++ gnokii-0.6.27/common/phones/atgen.c	2009-05-20 15:08:04.000000000 +0200
@@ -2927,7 +2927,7 @@
 		case 0: /* network operator name given */
 			pos = strip_quotes(strings[2]);
 			at_decode(drvinst->charset, tmp, pos, strlen(pos));
-			snprintf(data->network_info->network_code, sizeof(data->network_info->network_code), gn_network_code_get(tmp));
+			snprintf(data->network_info->network_code, sizeof(data->network_info->network_code), "%s", gn_network_code_get(tmp));
 			break;
 		case 2: /* network operator code given */
 			if (strlen(strings[2]) == 5) {
@@ -2947,7 +2947,7 @@
 				data->network_info->network_code[5] = strings[2][5];
 				data->network_info->network_code[6] = 0;
 			} else { /* probably incorrect */
-				snprintf(data->network_info->network_code, sizeof(data->network_info->network_code), strings[2]);
+				snprintf(data->network_info->network_code, sizeof(data->network_info->network_code), "%S", strings[2]);
 			}
 			break;
 		default: /* defined formats are in range (0-2) */
Index: gnokii-0.6.27/gnokii/gnokii-utils.c
===================================================================
--- gnokii-0.6.27/gnokii/gnokii-utils.c
+++ gnokii-0.6.27/gnokii/gnokii-utils.c	2009-05-20 15:16:01.000000000 +0200
@@ -113,7 +113,7 @@
 	if (udata->type != GN_SMS_DATA_iMelody && chars_read > 0 && message_buffer[chars_read - 1] == '\n')
 		message_buffer[--chars_read] = 0;
 	if (chars_read > GNOKII_MIN(input_len, sizeof(udata->u.text) - 1)) {
-		fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"), chars_read, GNOKII_MIN(input_len, sizeof(udata->u.text) - 1));
+		fprintf(stderr, _("Input too long! (%d, maximum is %d)\n"), chars_read, (unsigned int)GNOKII_MIN(input_len, sizeof(udata->u.text) - 1));
 		return GN_ERR_INTERNALERROR;
 	}
 
Index: gnokii-0.6.27/gnokii/gnokii-wap.c
===================================================================
--- gnokii-0.6.27/gnokii/gnokii-wap.c
+++ gnokii-0.6.27/gnokii/gnokii-wap.c	2009-05-20 15:14:47.000000000 +0200
@@ -116,8 +116,8 @@
 	if (argc != optind + 1)
 		return writewapbookmark_usage(stderr, -1);
 
-	snprintf(&wapbookmark.name[0], WAP_NAME_MAX_LENGTH, optarg);
-	snprintf(&wapbookmark.URL[0], WAP_URL_MAX_LENGTH, argv[optind]);
+	snprintf(&wapbookmark.name[0], WAP_NAME_MAX_LENGTH, "%s", optarg);
+	snprintf(&wapbookmark.URL[0], WAP_URL_MAX_LENGTH, "%s", argv[optind]);
 
 	error = gn_sm_functions(GN_OP_WriteWAPBookmark, data, state);