ruby-changes:18262
From: akr <ko1@a...>
Date: Tue, 21 Dec 2010 07:40:04 +0900 (JST)
Subject: [ruby-changes:18262] Ruby:r30285 (trunk): * pack.c: parenthesize macro arguments.
akr 2010-12-21 07:39:55 +0900 (Tue, 21 Dec 2010) New Revision: 30285 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30285 Log: * pack.c: parenthesize macro arguments. Modified files: trunk/ChangeLog trunk/pack.c Index: ChangeLog =================================================================== --- ChangeLog (revision 30284) +++ ChangeLog (revision 30285) @@ -1,3 +1,7 @@ +Tue Dec 21 07:39:12 2010 Tanaka Akira <akr@f...> + + * pack.c: parenthesize macro arguments. + Tue Dec 21 06:25:43 2010 Nobuyoshi Nakada <nobu@r...> * test/rexml/test_contrib.rb (ContribTester#test_pos): should not Index: pack.c =================================================================== --- pack.c (revision 30284) +++ pack.c (revision 30285) @@ -213,22 +213,22 @@ #ifdef FLOAT_SWAPPER # define FLOAT_CONVWITH(y) FLOAT_SWAPPER y; -# define HTONF(x,y) (memcpy(&y,&x,sizeof(float)), \ - y = rb_htonf((FLOAT_SWAPPER)y), \ - memcpy(&x,&y,sizeof(float)), \ - x) -# define HTOVF(x,y) (memcpy(&y,&x,sizeof(float)), \ - y = rb_htovf((FLOAT_SWAPPER)y), \ - memcpy(&x,&y,sizeof(float)), \ - x) -# define NTOHF(x,y) (memcpy(&y,&x,sizeof(float)), \ - y = rb_ntohf((FLOAT_SWAPPER)y), \ - memcpy(&x,&y,sizeof(float)), \ - x) -# define VTOHF(x,y) (memcpy(&y,&x,sizeof(float)), \ - y = rb_vtohf((FLOAT_SWAPPER)y), \ - memcpy(&x,&y,sizeof(float)), \ - x) +# define HTONF(x,y) (memcpy(&(y),&(x),sizeof(float)), \ + (y) = rb_htonf((FLOAT_SWAPPER)(y)), \ + memcpy(&(x),&(y),sizeof(float)), \ + (x)) +# define HTOVF(x,y) (memcpy(&(y),&(x),sizeof(float)), \ + (y) = rb_htovf((FLOAT_SWAPPER)(y)), \ + memcpy(&(x),&(y),sizeof(float)), \ + (x)) +# define NTOHF(x,y) (memcpy(&(y),&(x),sizeof(float)), \ + (y) = rb_ntohf((FLOAT_SWAPPER)(y)), \ + memcpy(&(x),&(y),sizeof(float)), \ + (x)) +# define VTOHF(x,y) (memcpy(&(y),&(x),sizeof(float)), \ + (y) = rb_vtohf((FLOAT_SWAPPER)(y)), \ + memcpy(&(x),&(y),sizeof(float)), \ + (x)) #else # define FLOAT_CONVWITH(y) # define HTONF(x,y) rb_htonf(x) @@ -239,22 +239,22 @@ #ifdef DOUBLE_SWAPPER # define DOUBLE_CONVWITH(y) DOUBLE_SWAPPER y; -# define HTOND(x,y) (memcpy(&y,&x,sizeof(double)), \ - y = rb_htond((DOUBLE_SWAPPER)y), \ - memcpy(&x,&y,sizeof(double)), \ - x) -# define HTOVD(x,y) (memcpy(&y,&x,sizeof(double)), \ - y = rb_htovd((DOUBLE_SWAPPER)y), \ - memcpy(&x,&y,sizeof(double)), \ - x) -# define NTOHD(x,y) (memcpy(&y,&x,sizeof(double)), \ - y = rb_ntohd((DOUBLE_SWAPPER)y), \ - memcpy(&x,&y,sizeof(double)), \ - x) -# define VTOHD(x,y) (memcpy(&y,&x,sizeof(double)), \ - y = rb_vtohd((DOUBLE_SWAPPER)y), \ - memcpy(&x,&y,sizeof(double)), \ - x) +# define HTOND(x,y) (memcpy(&(y),&(x),sizeof(double)), \ + (y) = rb_htond((DOUBLE_SWAPPER)(y)), \ + memcpy(&(x),&(y),sizeof(double)), \ + (x)) +# define HTOVD(x,y) (memcpy(&(y),&(x),sizeof(double)), \ + (y) = rb_htovd((DOUBLE_SWAPPER)(y)), \ + memcpy(&(x),&(y),sizeof(double)), \ + (x)) +# define NTOHD(x,y) (memcpy(&(y),&(x),sizeof(double)), \ + (y) = rb_ntohd((DOUBLE_SWAPPER)(y)), \ + memcpy(&(x),&(y),sizeof(double)), \ + (x)) +# define VTOHD(x,y) (memcpy(&(y),&(x),sizeof(double)), \ + (y) = rb_vtohd((DOUBLE_SWAPPER)(y)), \ + memcpy(&(x),&(y),sizeof(double)), \ + (x)) #else # define DOUBLE_CONVWITH(y) # define HTOND(x,y) rb_htond(x) @@ -1212,11 +1212,11 @@ #define PACK_LENGTH_ADJUST_SIZE(sz) do { \ tmp_len = 0; \ - if (len > (long)((send-s)/sz)) { \ + if (len > (long)((send-s)/(sz))) { \ if (!star) { \ - tmp_len = len-(send-s)/sz; \ + tmp_len = len-(send-s)/(sz); \ } \ - len = (send-s)/sz; \ + len = (send-s)/(sz); \ } \ } while (0) @@ -1855,7 +1855,7 @@ PACK_LENGTH_ADJUST_SIZE(sizeof(float)); while (len-- > 0) { float tmp; - FLOAT_CONVWITH(ftmp;) + FLOAT_CONVWITH(ftmp); memcpy(&tmp, s, sizeof(float)); s += sizeof(float); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/