Просмотр исходного кода

* Cleanup EncryptedString to only overload puts(String)

Bryan Drewery 17 лет назад
Родитель
Сommit
fdc3d29b6d
2 измененных файлов с 3 добавлено и 20 удалено
  1. 2 10
      src/EncryptedStream.c
  2. 1 10
      src/EncryptedStream.h

+ 2 - 10
src/EncryptedStream.c

@@ -21,17 +21,9 @@ int EncryptedStream::gets (char *_data, size_t maxSize) {
   return size;
 }
 
-void EncryptedStream::printf (const char* format, ...)
+void EncryptedStream::puts (const bd::String& str_in)
 {
-  char va_out[1024] = "";
-  va_list va;
-  size_t len = 0;
-
-  va_start(va, format);
-  len = vsnprintf(va_out, sizeof(va_out), format, va);
-  va_end(va);
-
-  bd::String string(va_out, len);
+  bd::String string(str_in);
   if (key.length()) {
     if (string[string.length() - 1] == '\n')
       --string;

+ 1 - 10
src/EncryptedStream.h

@@ -19,15 +19,6 @@ class EncryptedStream : public bd::Stream {
         EncryptedStream(EncryptedStream& stream) : Stream(stream), key(stream.key) {};
 
         virtual int gets(char *, size_t);
-#ifdef __GNUC__
-        /* GNU GCC DOC:
-           Since non-static C++ methods have an implicit this argument, the arguments of such methods
-           should be counted from two, not one, when giving values for string-index and first-to-check.
-         */
-        virtual void printf(const char*, ...) __attribute__ ((format(printf, 2, 3)));
-#else
-	virtual void printf(const char*, ...);
-#endif
-
+        virtual void puts (const bd::String& string);
 };
 #endif