trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jplev...@apache.org
Subject svn commit: r921581 - in /incubator/trafficserver/traffic/trunk/iocore/cache: CacheHttp.cc P_CacheDir.h
Date Wed, 10 Mar 2010 21:38:14 GMT
Author: jplevyak
Date: Wed Mar 10 21:38:13 2010
New Revision: 921581

URL: http://svn.apache.org/viewvc?rev=921581&view=rev
Log:
TS-158: RHEL4 fixes, thanx to Manjesh Nilange

Modified:
    incubator/trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc
    incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc?rev=921581&r1=921580&r2=921581&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc Wed Mar 10 21:38:13 2010
@@ -245,7 +245,7 @@ CacheHTTPInfoVector::get_handles(const c
     int tmp = info.get_handle((char *) buf, length - (buf - start));
     if (tmp < 0) {
       ink_assert(!"CacheHTTPInfoVector::unmarshal get_handle() failed");
-      return -1;
+      return (inku32) -1;
     }
     buf += tmp;
 

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h?rev=921581&r1=921580&r2=921581&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/P_CacheDir.h Wed Mar 10 21:38:13 2010
@@ -159,7 +159,7 @@ struct FreeDir
 #endif
 };
 
-#define dir_bit(_e, _w, _b) (((_e)->w[_w] >> (_b)) & 1)
+#define dir_bit(_e, _w, _b) ((inku32)(((_e)->w[_w] >> (_b)) & 1))
 #define dir_set_bit(_e, _w, _b, _v) (_e)->w[_w] = (inku16)(((_e)->w[_w] & ~(1<<(_b)))
| (((_v)?1:0)<<(_b)))
 #define dir_offset(_e) ((ink64)                                         \
                          (((inku64)(_e)->w[0]) |                        \
@@ -194,7 +194,7 @@ struct FreeDir
                                   (_s <= DIR_SIZE_WITH_BLOCK(1) ? ROUND_TO(_s, DIR_BLOCK_SIZE(1))
: \
                                    (_s <= DIR_SIZE_WITH_BLOCK(2) ? ROUND_TO(_s, DIR_BLOCK_SIZE(2))
: \
                                     ROUND_TO(_s, DIR_BLOCK_SIZE(3)))))
-#define dir_tag(_e) ((_e)->w[2]&((1<<DIR_TAG_WIDTH)-1))
+#define dir_tag(_e) ((inku32)((_e)->w[2]&((1<<DIR_TAG_WIDTH)-1)))
 #define dir_set_tag(_e,_t) (_e)->w[2] = (inku16)(((_e)->w[2]&~((1<<DIR_TAG_WIDTH)-1))
| ((_t)&((1<<DIR_TAG_WIDTH)-1)))
 #define dir_phase(_e) dir_bit(_e,2,12)
 #define dir_set_phase(_e,_v) dir_set_bit(_e,2,12,_v)



Mime
View raw message