Blob Blame History Raw
diff -up kismet-2007-10-R1/finitestate.cc.printf kismet-2007-10-R1/finitestate.cc
--- kismet-2007-10-R1/finitestate.cc.printf	2005-06-03 07:31:10.000000000 +0200
+++ kismet-2007-10-R1/finitestate.cc	2007-10-08 09:16:00.000000000 +0200
@@ -224,8 +224,9 @@ int BssTimestampAutomata::ProcessPacket(
 
             snprintf(atext, STATUS_MAX, "Out-of-sequence BSS timestamp on %s "
                      "- got %llx, expected %llx - this could indicate AP spoofing",
-                     in_info->bssid_mac.Mac2String().c_str(), in_info->timestamp,
-                     elem->bss_timestamp);
+                     in_info->bssid_mac.Mac2String().c_str(),
+		     static_cast<long long unsigned>(in_info->timestamp),
+                     static_cast<long long unsigned>(elem->bss_timestamp));
             atracker->RaiseAlert(alertid, in_info->bssid_mac, 0, 0, 0, 
 								 in_info->channel, atext);
 
diff -up kismet-2007-10-R1/gpsmap.cc.printf kismet-2007-10-R1/gpsmap.cc
--- kismet-2007-10-R1/gpsmap.cc.printf	2007-10-08 09:16:00.000000000 +0200
+++ kismet-2007-10-R1/gpsmap.cc	2007-10-08 09:16:00.000000000 +0200
@@ -1025,7 +1025,7 @@ int ProcessGPSFile(char *in_fname) {
     
     // Sanitize the data and build the map of points we don't look at
     if (verbose)
-        fprintf(stderr, "NOTICE:  Sanitizing %d sample points...\n", 
+        fprintf(stderr, "NOTICE:  Sanitizing %zd sample points...\n", 
                 file_points.size());
     SanitizeSamplePoints(file_points, &file_screen);
 
@@ -2881,7 +2881,7 @@ int DrawLegendComposite(vector<gps_netwo
     // contents
 
     // Test the standard text in col1
-    snprintf(text, 1024, "Visible networks: %d\n", drawn_net_map.size());
+    snprintf(text, 1024, "Visible networks: %zd\n", drawn_net_map.size());
     text_colwidth = kismax(text_colwidth, IMStringWidth(text, leg_img, leg_di));
 
     snprintf(text, 1024, "Map Created     : %.24s", ctime((const time_t *) &curtime));
@@ -2972,7 +2972,7 @@ int DrawLegendComposite(vector<gps_netwo
     cur_rowpos += tx_height + 2;
     */ 
 
-    snprintf(text, 1024, "Visible networks: %d\n", drawn_net_map.size());
+    snprintf(text, 1024, "Visible networks: %zd\n", drawn_net_map.size());
     tx_height = IMStringHeight(text, leg_img, leg_di);
 
     snprintf(prim, 1024, "text %d,%d \"%s\"",
@@ -4393,7 +4393,7 @@ int main(int argc, char *argv[]) {
         gpsnetvec.push_back(x->second);
     }
 
-    fprintf(stderr, "Plotting %d networks...\n", gpsnetvec.size());
+    fprintf(stderr, "Plotting %zd networks...\n", gpsnetvec.size());
 
     for (unsigned int x = 0; x < draw_feature_order.length(); x++) {
         switch (draw_feature_order[x]) {
diff -up kismet-2007-10-R1/server_protocols.cc.printf kismet-2007-10-R1/server_protocols.cc
--- kismet-2007-10-R1/server_protocols.cc.printf	2007-03-27 14:44:20.000000000 +0200
+++ kismet-2007-10-R1/server_protocols.cc	2007-10-08 09:16:00.000000000 +0200
@@ -522,7 +522,7 @@ void Protocol_Network2Data(const wireles
     snprintf(tmpstr, 128, "%d", net->dupeiv_packets);
     data->ndvec.push_back(tmpstr);
 
-    snprintf(tmpstr, 128, "%lld", net->bss_timestamp);
+    snprintf(tmpstr, 128, "%lld", static_cast<long long int>(net->bss_timestamp));
     data->ndvec.push_back(tmpstr);
 
 }
diff -up kismet-2007-10-R1/tcpclient.cc.printf kismet-2007-10-R1/tcpclient.cc
diff -up kismet-2007-10-R1/panelfront_display.cc.printf kismet-2007-10-R1/panelfront_display.cc
--- kismet-2007-10-R1/panelfront_display.cc.printf	2007-10-05 03:42:30.000000000 +0200
+++ kismet-2007-10-R1/panelfront_display.cc	2007-10-08 09:16:00.000000000 +0200
@@ -1711,7 +1711,8 @@ int PanelFront::DetailsPrinter(void *in_
 
 	// Added by Sven-Ola, may need le64_to_cpu()? Also added the bss_tsf
 	// to the kismet tcp protocol used between client and server
-	snprintf(output, print_width, "BSS Time: %llx", dnet->bss_timestamp);
+	snprintf(output, print_width, "BSS Time: %llx",
+		 static_cast<long long unsigned>(dnet->bss_timestamp));
         kwin->text.push_back(output);
 
         if (dnet->maxseenrate != 0) {