[前][次][番号順一覧][スレッド一覧]

ruby-changes:16999

From: mrkn <ko1@a...>
Date: Sun, 15 Aug 2010 18:21:00 +0900 (JST)
Subject: [ruby-changes:16999] Ruby:r28996 (trunk): * ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_inspect, VPrint, VpToString, VpVarCheck): use PRIuSIZE, PRIdSIZE, PRIdVALUE, and PRIxVALUE.

mrkn	2010-08-15 18:20:44 +0900 (Sun, 15 Aug 2010)

  New Revision: 28996

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28996

  Log:
    * ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_inspect, VPrint, VpToString, VpVarCheck): use PRIuSIZE, PRIdSIZE, PRIdVALUE, and PRIxVALUE.

  Modified files:
    trunk/ChangeLog
    trunk/ext/bigdecimal/bigdecimal.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28995)
+++ ChangeLog	(revision 28996)
@@ -1,3 +1,9 @@
+Sun Aug 15 18:14:20 2010  Kenta Murata  <mrkn@m...>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_inspect,
+	  VPrint, VpToString, VpVarCheck): use PRIuSIZE, PRIdSIZE, PRIdVALUE,
+	  and PRIxVALUE.
+
 Sun Aug 15 16:14:31 2010  NAKAMURA Usaku  <usa@r...>
 
 	* lib/mkmf.rb (Logging.postpone): close @log only when it's available.
Index: ext/bigdecimal/bigdecimal.c
===================================================================
--- ext/bigdecimal/bigdecimal.c	(revision 28995)
+++ ext/bigdecimal/bigdecimal.c	(revision 28996)
@@ -239,7 +239,7 @@
     GUARD_OBJ(vp,GetVpValue(self,1));
     dump = rb_str_new(0,VpNumOfChars(vp,"E")+50);
     psz = RSTRING_PTR(dump);
-    sprintf(psz,"%zu:",VpMaxPrec(vp)*VpBaseFig());
+    sprintf(psz, "%"PRIuSIZE":", VpMaxPrec(vp)*VpBaseFig());
     VpToString(vp, psz+strlen(psz), 0, 0);
     rb_str_resize(dump, strlen(psz));
     return dump;
@@ -1635,11 +1635,11 @@
 
     obj = rb_str_new(0, nc+256);
     psz = RSTRING_PTR(obj);
-    sprintf(psz,"#<BigDecimal:%lx,'",self);
+    sprintf(psz,"#<BigDecimal:%"PRIxVALUE",'",self);
     tmp = psz + strlen(psz);
     VpToString(vp, tmp, 10, 0);
     tmp += strlen(tmp);
-    sprintf(tmp, "',%zu(%zu)>", VpPrec(vp)*VpBaseFig(), VpMaxPrec(vp)*VpBaseFig());
+    sprintf(tmp, "',%"PRIuSIZE"(%"PRIuSIZE")>", VpPrec(vp)*VpBaseFig(), VpMaxPrec(vp)*VpBaseFig());
     rb_str_resize(obj, strlen(psz));
     return obj;
 }
@@ -3692,7 +3692,7 @@
                         m /= 10;
                     }
                 }
-                nc += fprintf(fp, "E%zi", VpExponent10(a));
+                nc += fprintf(fp, "E%"PRIdVALUE, VpExponent10(a));
             } else {
                 nc += fprintf(fp, "0.0");
             }
@@ -3889,7 +3889,7 @@
         shift /= 10;
     }
     while(psz[-1]=='0') *(--psz) = 0;
-    sprintf(psz, "E%ld", ex);
+    sprintf(psz, "E%"PRIdVALUE, ex);
     if(fFmt) VpFormatSt(pszSav, fFmt);
 }
 
@@ -4394,7 +4394,7 @@
     if(gfDebug) {
         VpMult(r, y, y);
         VpAddSub(f, x, r, -1);
-        printf("VpSqrt: iterations = %lu\n", nr);
+        printf("VpSqrt: iterations = %"PRIdSIZE"\n", nr);
         VPrint(stdout, "  y =% \n", y);
         VPrint(stdout, "  x =% \n", x);
         VPrint(stdout, "  x-y*y = % \n", f);
@@ -4779,24 +4779,24 @@
  *   other ... error
  */
 {
-    U_LONG i;
+    size_t i;
 
     if(v->MaxPrec <= 0) {
-        printf("ERROR(VpVarCheck): Illegal Max. Precision(=%lu)\n",
+        printf("ERROR(VpVarCheck): Illegal Max. Precision(=%"PRIuSIZE")\n",
             v->MaxPrec);
         return 1;
     }
     if((v->Prec <= 0) ||((v->Prec) >(v->MaxPrec))) {
-        printf("ERROR(VpVarCheck): Illegal Precision(=%lu)\n", v->Prec);
-        printf("       Max. Prec.=%lu\n", v->MaxPrec);
+        printf("ERROR(VpVarCheck): Illegal Precision(=%"PRIuSIZE")\n", v->Prec);
+        printf("       Max. Prec.=%"PRIuSIZE"\n", v->MaxPrec);
         return 2;
     }
     for(i = 0; i < v->Prec; ++i) {
         if((v->frac[i] >= BASE)) {
             printf("ERROR(VpVarCheck): Illegal fraction\n");
-            printf("       Frac[%ld]=%lu\n", i, v->frac[i]);
-            printf("       Prec.   =%lu\n", v->Prec);
-            printf("       Exp. =%d\n", v->exponent);
+            printf("       Frac[%"PRIuSIZE"]=%lu\n", i, v->frac[i]);
+            printf("       Prec.   =%"PRIuSIZE"\n", v->Prec);
+            printf("       Exp. =%"PRIdVALUE"\n", v->exponent);
             printf("       BASE =%lu\n", BASE);
             return 3;
         }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]