svn commit: r945972 - in /trafficserver/traffic/trunk: libinktomi++/Compatability.h proxy/mgmt2/preparse/StoreReadConfig.cc proxy/mgmt2/utils/WebMgmtUtils.cc

[jp...@apache.org]

Author: jplevyak
Date: Wed May 19 00:27:31 2010
New Revision: 945972

URL: http://svn.apache.org/viewvc?rev=945972&view=rev
Log:
TS-358: remove more cruft: ink_sscan_longlong, bcopy, in_addr_t

Modified:
    trafficserver/traffic/trunk/libinktomi++/Compatability.h
    trafficserver/traffic/trunk/proxy/mgmt2/preparse/StoreReadConfig.cc
    trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc

Modified: trafficserver/traffic/trunk/libinktomi++/Compatability.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Compatability.h?rev=945972&r1=945971&r2=945972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Compatability.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/Compatability.h Wed May 19 00:27:31 2010
@@ -27,6 +27,9 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <strings.h>
 
 #include "ink_port.h"
 #include "ink_resource.h"
@@ -63,42 +66,12 @@ template<class T> T max(const T a, const
 #define MAP_SHARED_MAP_NORESERVE (MAP_SHARED | MAP_NORESERVE)
 #endif
 
-#if (HOST_OS == linux)
-#ifndef __x86_64
-typedef unsigned long long uint64_t;
-#endif
-#endif
-
-#if ((HOST_OS == freebsd) || (HOST_OS == darwin))
+#if (HOST_OS == darwin)
 typedef uint32_t in_addr_t;
 #endif
 
 #define NEED_HRTIME
 
-#include <stdio.h>
-
-#if (HOST_OS == freebsd)
-static inline int
-ink_sscan_longlong(const char *str, ink64 * value)
-{
-  return sscanf(str, "%qd", value);
-}
-#else
-static inline int
-ink_sscan_longlong(const char *str, ink64 * value)
-{
-  // coverity[secure_coding]
-  return sscanf(str, "%lld", value);
-}
-#endif
-
-#if (HOST_OS == linux)
-#define BCOPY_TYPE (char *)
-#else
-#define BCOPY_TYPE (void *)
-extern "C" void bcopy(const void *s1, void *s2, size_t n);
-#endif
-
 #define ink_pread      pread
 #define ink_pwrite     pwrite
 #define ink_open       open

Modified: trafficserver/traffic/trunk/proxy/mgmt2/preparse/StoreReadConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/preparse/StoreReadConfig.cc?rev=945972&r1=945971&r2=945972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/preparse/StoreReadConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/preparse/StoreReadConfig.cc Wed May 19 00:27:31 2010
@@ -59,7 +59,7 @@ parseStorageFile(int fd)
     while (*e && !isdigit(*e))
       e++;
     if (e && *e) {
-      if (1 != ink_sscan_longlong(e, &size)) {
+      if (1 != sscanf(e, "%lld", &size)) {
         err = "error parsing size";
         goto Lfail;
       }

Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc?rev=945972&r1=945971&r2=945972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc Wed May 19 00:27:31 2010
@@ -76,21 +76,21 @@ varSetFromStr(const char *varName, const
 
   switch (varDataType) {
   case RECD_INT:
-    if (ink_sscan_longlong(value, &data.rec_int) == 1) {
+    if (sscanf(value, "%lld", &data.rec_int) == 1) {
       RecSetRecordInt((char *) varName, data.rec_int);
     } else {
       found = false;
     }
     break;
   case RECD_LLONG:
-    if (ink_sscan_longlong(value, &data.rec_llong) == 1) {
+    if (sscanf(value, "%lld", &data.rec_llong) == 1) {
       RecSetRecordLLong((char *) varName, data.rec_llong);
     } else {
       found = false;
     }
     break;
   case RECD_COUNTER:
-    if (ink_sscan_longlong(value, &data.rec_counter) == 1) {
+    if (sscanf(value, "%lld", &data.rec_counter) == 1) {
       RecSetRecordCounter((char *) varName, data.rec_counter);
     } else {
       found = false;