Diff: SnSDUtils.h

Revision:

12:d472f9811262

Parent:

10:3c93db1cfb12

Child:

15:f2569d8e4176

--- a/SnSDUtils.h	Mon Aug 13 20:44:06 2012 +0000
+++ b/SnSDUtils.h	Sat Aug 18 05:00:32 2012 +0000
@@ -38,8 +38,9 @@
     static
     void  DeleteFile(FILE*& f, const char* fname);
         
-    static char fgCurFileName[kFNBufSize];
-    static FILE* fgCurFile;
+    static char     fgCurFileName[kFNBufSize];
+    static FILE*    fgCurFile;
+    static uint16_t fgCurSeq;
     
  public:
     SnSDUtils() {}
@@ -47,7 +48,7 @@
     
     static
     int   CloseOutputFile(FILE* f) {
-        // TODO: set current file pointer to 0
+        // TODO: set current file pointer to 0, IF f is current file
         const int rt = (f!=0) ? fclose(f) : 0;
         return rt;
     }
@@ -61,13 +62,13 @@
     
     static
     SnCommWin::ECommWinResult SendAllFiles(SnCommWin* comm,
-                                           const bool doDelete,
                                            const uint32_t timeout,
                                            char* const buf,
                                            const uint32_t bsize,
                                            const SnConfigFrame& curConf,
                                                  SnEventFrame& evt,
-                                                 SnPowerFrame& pow);
+                                                 SnPowerFrame& pow,
+                                           const uint32_t handshakeTimeout);
     
     static
     const char* GetCurFileName() { return fgCurFileName; }
@@ -76,7 +77,7 @@
     FILE*       GetCurFile() { return fgCurFile; }
     
     static
-    uint16_t    GetCurSeqNum();
+    uint16_t    GetCurSeqNum() { return fgCurSeq; }
 
     static
     uint16_t    GetSeqNumFromFileName(const char* fn);
@@ -94,7 +95,7 @@
     static
     SnCommWin::ECommWinResult WritePowerTo(T& f,
                                            const SnPowerFrame& pow,
-                                           uint32_t& pnum) {
+                                           uint32_t pnum) {
         const SnCommWin::ECommWinResult rs = 
             SnHeaderFrame::WriteTo(f, SnHeaderFrame::kPowerCode, 
                                    SnPowerFrame::SizeOf(SnPowerFrame::kIOvers));