From 9b0ffa0249527617332aee27fe5b472a54c3bdbb Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Mon, 8 Apr 2013 15:34:54 -0700
Subject: [PATCH] brought CYASSL_CALLBACK code up to current standard

---
 cyassl/callbacks.h       | 4 ++--
 cyassl/internal.h        | 2 +-
 examples/client/client.c | 4 ++--
 examples/server/server.c | 4 ++--
 src/internal.c           | 6 ++++++
 src/ssl.c                | 5 +++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/cyassl/callbacks.h b/cyassl/callbacks.h
index 71f23bc43..7f0676cd6 100644
--- a/cyassl/callbacks.h
+++ b/cyassl/callbacks.h
@@ -1,4 +1,4 @@
-/* cyassl_callbacks.h
+/* callbacks.h
  *
  * Copyright (C) 2013 wolfSSL Inc.
  *
@@ -76,5 +76,5 @@ typedef struct timeoutInfo_st {
 #endif
 
 
-#endif /* CyaSSL_CALLBACKS_H */
+#endif /* CYASSL_CALLBACKS_H */
 
diff --git a/cyassl/internal.h b/cyassl/internal.h
index 80bf98913..3182e7ec1 100644
--- a/cyassl/internal.h
+++ b/cyassl/internal.h
@@ -57,7 +57,7 @@
 #endif
 
 #ifdef CYASSL_CALLBACKS
-    #include <cyassl/openssl/cyassl_callbacks.h>
+    #include <cyassl/callbacks.h>
     #include <signal.h>
 #endif
 
diff --git a/examples/client/client.c b/examples/client/client.c
index 9d948ba34..81d762e4a 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -646,14 +646,14 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
 
     int handShakeCB(HandShakeInfo* info)
     {
-
+        (void)info;
         return 0;
     }
 
 
     int timeoutCB(TimeoutInfo* info)
     {
-
+        (void)info;
         return 0;
     }
 
diff --git a/examples/server/server.c b/examples/server/server.c
index db87df42e..aaa3f8b05 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -481,14 +481,14 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
 
     int srvHandShakeCB(HandShakeInfo* info)
     {
-
+        (void)info;
         return 0;
     }
 
 
     int srvTimeoutCB(TimeoutInfo* info)
     {
-
+        (void)info;
         return 0;
     }
 
diff --git a/src/internal.c b/src/internal.c
index aa1eb9a3a..eccbff327 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -60,6 +60,11 @@
     #error OPENSSL_EXTRA needs DH, please remove NO_DH
 #endif
 
+#if defined(CYASSL_CALLBACKS) && !defined(LARGE_STATIC_BUFFERS)
+    #error \
+CYASSL_CALLBACKS needs LARGE_STATIC_BUFFERS, please add LARGE_STATIC_BUFFERS
+#endif
+
 
 #ifndef NO_CYASSL_CLIENT
     static int DoHelloVerifyRequest(CYASSL* ssl, const byte* input, word32*);
@@ -6424,6 +6429,7 @@ int SetCipherList(Suites* s, const char* list)
     void FreeTimeoutInfo(TimeoutInfo* info, void* heap)
     {
         int i;
+        (void)heap;
         for (i = 0; i < MAX_PACKETS_HANDSHAKE; i++)
             if (info->packets[i].bufferValue) {
                 XFREE(info->packets[i].bufferValue, heap, DYNAMIC_TYPE_INFO);
diff --git a/src/ssl.c b/src/ssl.c
index 8b8193bff..b2237870d 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -3500,7 +3500,7 @@ int CyaSSL_set_compression(CYASSL* ssl)
         do {                                        \
             c.tv_sec  = a.tv_sec  + b.tv_sec;       \
             c.tv_usec = a.tv_usec + b.tv_usec;      \
-            if (c.tv_sec >=  1000000) {             \
+            if (c.tv_usec >=  1000000) {            \
                 c.tv_sec++;                         \
                 c.tv_usec -= 1000000;               \
             }                                       \
@@ -3511,7 +3511,7 @@ int CyaSSL_set_compression(CYASSL* ssl)
         do {                                        \
             c.tv_sec  = a.tv_sec  - b.tv_sec;       \
             c.tv_usec = a.tv_usec - b.tv_usec;      \
-            if (c.tv_sec < 0) {                     \
+            if (c.tv_usec < 0) {                    \
                 c.tv_sec--;                         \
                 c.tv_usec += 1000000;               \
             }                                       \
@@ -3526,6 +3526,7 @@ int CyaSSL_set_compression(CYASSL* ssl)
     /* do nothing handler */
     static void myHandler(int signo)
     {
+        (void)signo;
         return;
     }