ipsec-tools-0.6.7-printf-format-string.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  1. [patch]: ipsec-tools: fix printf format string for size_t
  2. Use %zu instead of %d for printing out size_t variables. Fixes a build issue
  3. on 64bit as ipsec-tools uses -Werror.
  4. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  5. ---
  6. src/racoon/algorithm.c | 6 +++---
  7. src/racoon/oakley.c | 4 ++--
  8. 2 files changed, 5 insertions(+), 5 deletions(-)
  9. Index: ipsec-tools-0.6.7/src/racoon/oakley.c
  10. ===================================================================
  11. --- ipsec-tools-0.6.7.orig/src/racoon/oakley.c
  12. +++ ipsec-tools-0.6.7/src/racoon/oakley.c
  13. @@ -252,7 +252,7 @@
  14. #ifdef ENABLE_STATS
  15. gettimeofday(&end, NULL);
  16. - syslog(LOG_NOTICE, "%s(%s%d): %8.6f", __func__,
  17. + syslog(LOG_NOTICE, "%s(%s%zu): %8.6f", __func__,
  18. s_attr_isakmp_group(dh->type), dh->prime->l << 3,
  19. timedelta(&start, &end));
  20. #endif
  21. @@ -299,7 +299,7 @@
  22. #ifdef ENABLE_STATS
  23. gettimeofday(&end, NULL);
  24. - syslog(LOG_NOTICE, "%s(%s%d): %8.6f", __func__,
  25. + syslog(LOG_NOTICE, "%s(%s%zu): %8.6f", __func__,
  26. s_attr_isakmp_group(dh->type), dh->prime->l << 3,
  27. timedelta(&start, &end));
  28. #endif
  29. Index: ipsec-tools-0.6.7/src/racoon/algorithm.c
  30. ===================================================================
  31. --- ipsec-tools-0.6.7.orig/src/racoon/algorithm.c
  32. +++ ipsec-tools-0.6.7/src/racoon/algorithm.c
  33. @@ -394,7 +394,7 @@
  34. #ifdef ENABLE_STATS
  35. gettimeofday(&end, NULL);
  36. - syslog(LOG_NOTICE, "%s(%s size=%d): %8.6f", __func__,
  37. + syslog(LOG_NOTICE, "%s(%s size=%zu): %8.6f", __func__,
  38. f->name, buf->l, timedelta(&start, &end));
  39. #endif
  40. @@ -506,7 +506,7 @@
  41. #ifdef ENABLE_STATS
  42. gettimeofday(&end, NULL);
  43. - syslog(LOG_NOTICE, "%s(%s klen=%d size=%d): %8.6f", __func__,
  44. + syslog(LOG_NOTICE, "%s(%s klen=%zu size=%zu): %8.6f", __func__,
  45. f->name, key->l << 3, buf->l, timedelta(&start, &end));
  46. #endif
  47. return res;
  48. @@ -535,7 +535,7 @@
  49. #ifdef ENABLE_STATS
  50. gettimeofday(&end, NULL);
  51. - syslog(LOG_NOTICE, "%s(%s klen=%d size=%d): %8.6f", __func__,
  52. + syslog(LOG_NOTICE, "%s(%s klen=%zu size=%zu): %8.6f", __func__,
  53. f->name, key->l << 3, buf->l, timedelta(&start, &end));
  54. #endif
  55. return res;