From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 26 Sep 2008 11:23:20 +0000 (+0200)
Subject: patches/bts498183-segfault-madvise: Removed unnecessary whitespace changes.
X-Git-Tag: debian/1.3.1-4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a7952449cf4265e0a3b738ec46e1776f4f76ed21;p=pkg-rrdtool.git

patches/bts498183-segfault-madvise: Removed unnecessary whitespace changes.
---

diff --git a/debian/patches/bts498183-segfault-madvise b/debian/patches/bts498183-segfault-madvise
index 8d381ef..b0697bf 100644
--- a/debian/patches/bts498183-segfault-madvise
+++ b/debian/patches/bts498183-segfault-madvise
@@ -1,24 +1,18 @@
 diff a/src/rrd_open.c b/src/rrd_open.c
 --- a/src/rrd_open.c
 +++ b/src/rrd_open.c
-@@ -363,14 +363,19 @@ void rrd_dontneed(
+@@ -363,6 +363,8 @@ void rrd_dontneed(
              rrd->rra_def[i].row_cnt * rrd->stat_head->ds_cnt *
              sizeof(rrd_value_t);
      }
 +
 +    if (dontneed_start < rrd_file->file_len) {
  #ifdef USE_MADVISE
--    madvise(rrd_file->file_start + dontneed_start,
--            rrd_file->file_len - dontneed_start, MADV_DONTNEED);
-+	    madvise(rrd_file->file_start + dontneed_start,
-+		    rrd_file->file_len - dontneed_start, MADV_DONTNEED);
- #endif
- #ifdef HAVE_POSIX_FADVISE
--    posix_fadvise(rrd_file->fd, dontneed_start,
--                  rrd_file->file_len - dontneed_start, POSIX_FADV_DONTNEED);
-+	    posix_fadvise(rrd_file->fd, dontneed_start,
-+			  rrd_file->file_len - dontneed_start,
-+			  POSIX_FADV_DONTNEED);
+     madvise(rrd_file->file_start + dontneed_start,
+             rrd_file->file_len - dontneed_start, MADV_DONTNEED);
+@@ -371,6 +373,8 @@ void rrd_dontneed(
+     posix_fadvise(rrd_file->fd, dontneed_start,
+                   rrd_file->file_len - dontneed_start, POSIX_FADV_DONTNEED);
  #endif
 +    }
 +