[tkreuzer] 39358: update ping from trunk

Author: tkreuzer
Date: Tue Feb  3 17:37:52 2009
New Revision: 39358

URL: http://svn.reactos.org/svn/reactos?rev=39358&view=rev
Log:
update ping from trunk

Modified:
    branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.c
    branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild

Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.c [iso-8859-1]
Tue Feb  3 17:37:52 2009
@@ -220,8 +220,8 @@
                     DataSize = GetULONG2(&argv[i][2], argv[i + 1], &i);
                     if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET))
                     {
-                        printf("Bad value for option -l, valid range is from 0 to
%I64d.\n",
-                            ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET));
+                        printf("Bad value for option -l, valid range is from 0 to
%d.\n",
+                            ICMP_MAXSIZE - (int)sizeof(ICMP_ECHO_PACKET));
                         return FALSE;
                    }
                     break;
@@ -453,8 +453,8 @@
     }
 
 
-    printf("Reply from %s: bytes=%I64d time%s%s TTL=%d\n",
inet_ntoa(from->sin_addr),
-      size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL);
+    printf("Reply from %s: bytes=%d time%s%s TTL=%d\n",
inet_ntoa(from->sin_addr),
+      size - IphLength - (int)sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL);
     if (RelativeTime.QuadPart < MinRTT.QuadPart || !MinRTTSet)
     {
         MinRTT.QuadPart = RelativeTime.QuadPart;

Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild
[iso-8859-1] Tue Feb  3 17:37:52 2009
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="ping" type="win32cui"
installbase="system32" installname="ping.exe"
allowwarnings="true">
+<module name="ping" type="win32cui"
installbase="system32" installname="ping.exe">
 	<include base="ping">.</include>
 	<define name="__USE_W32_SOCKETS" />
 	<library>kernel32</library>