about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2014-12-19 13:52:08 -0800
committerH.J. Lu <hjl.tools@gmail.com>2014-12-30 08:07:05 -0800
commit6490d945378090db82be2759ff66719a980d9c1c (patch)
tree46a77e36f0556e5cead6ff5e17de5572648eb147
parente401d5ca5d10c82f4e35bd9be7098b620ba04746 (diff)
downloadglibc-6490d945378090db82be2759ff66719a980d9c1c.tar.gz
glibc-6490d945378090db82be2759ff66719a980d9c1c.tar.xz
glibc-6490d945378090db82be2759ff66719a980d9c1c.zip
Replace %ld with %jd and cast to intmax_t
-rw-r--r--ChangeLog2
-rw-r--r--posix/tst-regex.c16
2 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 075ecbc90d..67a13b0a59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	* libio/tst-ftell-active-handler.c (do_append_test): Likewise.
 	* nptl/tst-mutex5.c: Include <stdint.h>.
 	(do_test): Replace %ld with %jd and cast to intmax_t.
+	* posix/tst-regex.c (run_test): Likewise.
+	(run_test_backwards): Likewise.
 
 2014-12-30  Andrew Senkevich  <andrew.senkevich@intel.com>
 	    H.J. Lu  <hongjiu.lu@intel.com>
diff --git a/posix/tst-regex.c b/posix/tst-regex.c
index 7df0bd1d38..0e086abc54 100644
--- a/posix/tst-regex.c
+++ b/posix/tst-regex.c
@@ -274,8 +274,8 @@ run_test (const char *expr, const char *mem, size_t memlen, int icase,
 	      finish.tv_sec -= start.tv_sec;
 	    }
 
-	  printf ("elapsed time: %ld.%09ld sec\n",
-		  finish.tv_sec, finish.tv_nsec);
+	  printf ("elapsed time: %jd.%09jd sec\n",
+		  (intmax_t) finish.tv_sec, (intmax_t) finish.tv_nsec);
 	}
     }
 
@@ -327,8 +327,8 @@ run_test (const char *expr, const char *mem, size_t memlen, int icase,
 		mintime = finish;
 	    }
 	}
-      printf ("elapsed time: %ld.%09ld sec\n",
-	      mintime.tv_sec, mintime.tv_nsec);
+      printf ("elapsed time: %jd.%09jd sec\n",
+	      (intmax_t) mintime.tv_sec, (intmax_t) mintime.tv_nsec);
     }
 #endif
 
@@ -420,8 +420,8 @@ run_test_backwards (const char *expr, const char *mem, size_t memlen,
 	      finish.tv_sec -= start.tv_sec;
 	    }
 
-	  printf ("elapsed time: %ld.%09ld sec\n",
-		  finish.tv_sec, finish.tv_nsec);
+	  printf ("elapsed time: %jd.%09jd sec\n",
+		  (intmax_t) finish.tv_sec, (intmax_t) finish.tv_nsec);
 	}
     }
 
@@ -489,8 +489,8 @@ run_test_backwards (const char *expr, const char *mem, size_t memlen,
 		mintime = finish;
 	    }
 	}
-      printf ("elapsed time: %ld.%09ld sec\n",
-	      mintime.tv_sec, mintime.tv_nsec);
+      printf ("elapsed time: %jd.%09jd sec\n",
+	      (intmax_t) mintime.tv_sec, (intmax_t) mintime.tv_nsec);
     }
 #endif