Fix MULTI / EXEC rendering in MONITOR output.

[redis.git] / src / rio.h

diff --git a/src/rio.h b/src/rio.h
index 31746303ca8edba559d6af401923ca0998912d7f..8befe6676e78a3ff269073964eea050259d7fed5 100644 (file)
--- a/src/rio.h
+++ b/src/rio.h
@@ -16,7 +16,7 @@ struct _rio {
      * data that was read or written so far. The method should be designed so that
      * can be called with the current checksum, and the buf and len fields pointing
      * to the new block of data to add to the checksum computation. */
      * data that was read or written so far. The method should be designed so that
      * can be called with the current checksum, and the buf and len fields pointing
      * to the new block of data to add to the checksum computation. */

-    void (*update_cksum)(struct _rio *, void *buf, size_t len);
+    void (*update_cksum)(struct _rio *, const void *buf, size_t len);

 
     /* The current checksum */
     uint64_t cksum;
 
     /* The current checksum */
     uint64_t cksum;


@@ -39,20 +39,20 @@ typedef struct _rio rio;
  * actual implementation of read / write / tell, and will update the checksum
  * if needed. */
 
  * actual implementation of read / write / tell, and will update the checksum
  * if needed. */
 

-inline size_t rioWrite(rio *r, const void *buf, size_t len) {
-    if (r->udpate_cksum) r->update_cksum(r,buf,len);
+static inline size_t rioWrite(rio *r, const void *buf, size_t len) {
+    if (r->update_cksum) r->update_cksum(r,buf,len);

     return r->write(r,buf,len);
 }
 
     return r->write(r,buf,len);
 }
 

-inline size_t rioRead(rio *r, void *buf, size_t len) {
+static inline size_t rioRead(rio *r, void *buf, size_t len) {

     if (r->read(r,buf,len) == 1) {
     if (r->read(r,buf,len) == 1) {

-        if (r->udpate_cksum) r->update_cksum(r,buf,len);
+        if (r->update_cksum) r->update_cksum(r,buf,len);

         return 1;
     }
     return 0;
 }
 
         return 1;
     }
     return 0;
 }
 

-inline off_t rioTell(rio *r) {
+static inline off_t rioTell(rio *r) {

     return r->tell(r);
 }
 
     return r->tell(r);
 }