Security-163.tar.gz

[apple/security.git] / cdsa / cdsa_utilities / memutils.h

diff --git a/cdsa/cdsa_utilities/memutils.h b/cdsa/cdsa_utilities/memutils.h
index aaea469d80f36e3697109c5fd8ba07ffd93525c8..ff7e10ad8c2b0746e1f8169f13b50274b959110a 100644 (file)
--- a/cdsa/cdsa_utilities/memutils.h
+++ b/cdsa/cdsa_utilities/memutils.h
@@ -27,11 +27,6 @@
 #include <algorithm>
 
 
-#ifdef _CPP_MEMUTILS
-# pragma export on
-#endif
-
-
 namespace Security
 {
 
@@ -108,122 +103,8 @@ inline ptrdiff_t difference(const void *p1, const void *p2)
 { return PointerInt(p1) - PointerInt(p2); }
 
 
-//
-// A simple utility for incremental creation of a contiguous memory block.
-//
-// Note that Writer and Writer::Counter go together. They use the same alignment
-// and padding rules, so Writer::Counter will correctly calculate total buffer
-// size for Writer, *presuming* that they are called in the same order.
-//
-// WARNING: There is no check for overflow. If you write too much, you will die.
-//
-class Writer {
-private:
-       void *advance(size_t size)
-       {
-               void *here = alignUp(writePos);
-               writePos = increment(here, size);
-               return here;
-       }
-    
-public:    
-       Writer() { }
-       Writer(void *base) : writePos(base) { }
-       void operator = (void *base) { writePos = base; }
-
-       template <class T>
-       T *operator () (const T &obj)
-       { T *here = (T *)advance(sizeof(T)); *here = obj; return here; }
-
-       void *operator () (const void *addr, size_t size)
-       { void *here = advance(size); return memcpy(here, addr, size); }
-
-       char *operator () (const char *s)
-       { return (char *)(*this)(s, strlen(s) + 1); }
-       
-       void countedData(const void *data, uint32 length)
-       { (*this)(length); (*this)(data, length); }
-       
-       template <class Data>
-       void countedData(const Data &data)
-       { countedData(data.data(), data.length()); }
-
-       class Counter;
-
-private:
-       void *writePos;                 // next byte address
-};
-
-class Writer::Counter {
-private:
-       void align() { totalSoFar = alignUp(totalSoFar); }
-
-public:
-       Counter() : totalSoFar(0) { }
-       operator size_t () { return totalSoFar; }
-
-       template <class T> size_t operator () (const T &) { align(); return totalSoFar += sizeof(T); }
-       size_t insert(size_t size) { align(); return totalSoFar += size; }
-       size_t operator () (const char *s) { align(); return totalSoFar += strlen(s) + 1; }
-       
-       void countedData(const void *, uint32 length)
-       { insert(sizeof(uint32)); insert(length); }
-       
-       template <class Data>
-       void countedData(const Data &data)
-       { countedData(data.data(), data.length()); }
-
-private:
-       size_t totalSoFar;      // total size counted so far
-};
-
-
-//
-// The Reader counter-part for a Writer.
-// Again, Reader and Writer share alignment and representation rules, so what was
-// Written shall be Read again, just fine.
-//
-class Reader {
-private:
-    const void *advance(size_t size = 0)
-    {
-        const void *here = alignUp(readPos);
-        readPos = increment(here, size);
-        return here;
-    }
-
-public:
-    Reader() { }
-    Reader(const void *base) : readPos(base) { }
-    void operator = (const void *base) { readPos = base; }
-    
-    template <class T>
-    void operator () (T &obj) {        obj = *reinterpret_cast<const T *>(advance(sizeof(T))); }
-    void operator () (void *addr, size_t size) { memcpy(addr, advance(size), size); }
-    void operator () (const char * &s)
-    { s = reinterpret_cast<const char *>(advance()); advance(strlen(s) + 1); }
-    template <class T>
-    const T *get(size_t size)
-       { return reinterpret_cast<const T *>(advance(size)); }
-       
-       void countedData(const void * &data, uint32 &length)
-       { (*this)(length); data = advance(length); }
-
-private:
-       // Explicitly forbid some invocations that are likely to be wrong.
-       void operator () (char * &s);   // can't get writable string in-place
-    
-private:
-    const void *readPos;       // next byte address
-};
-
-
 } // end namespace LowLevelMemoryUtilities
 
 } // end namespace Security
 
-#ifdef _CPP_MEMUTILS
-# pragma export off
-#endif
-
 #endif //_H_MEMUTILS