Added missing license and copyright in deps/hiredis.

[redis.git] / src / rio.h

diff --git a/src/rio.h b/src/rio.h
index 31746303ca8edba559d6af401923ca0998912d7f..43eae0cadb6f5c8c1a13f0cd65763da082df3bf2 100644 (file)
--- a/src/rio.h
+++ b/src/rio.h
@@ -1,3 +1,34 @@
+/*
+ * Copyright (c) 2009-2012, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *   * Neither the name of Redis nor the names of its contributors may be used
+ *     to endorse or promote products derived from this software without
+ *     specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
 #ifndef __REDIS_RIO_H
 #define __REDIS_RIO_H
 
@@ -16,7 +47,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. */
-    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;
@@ -39,20 +70,20 @@ typedef struct _rio rio;
  * 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);
 }
 
-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->udpate_cksum) r->update_cksum(r,buf,len);
+        if (r->update_cksum) r->update_cksum(r,buf,len);
         return 1;
     }
     return 0;
 }
 
-inline off_t rioTell(rio *r) {
+static inline off_t rioTell(rio *r) {
     return r->tell(r);
 }