diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 10:53:59 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-14 10:53:59 -0300 |
| commit | 1fafdadaae260eaef7194102b5eb842466e63dd1 (patch) | |
| tree | 734ab5c097f5a2ed36c2a7049d44f9c2bb46dede /testing/kismet/kismet-2008-05-R1-infinite-loop.diff | |
| parent | 1f52af629b1911ab027ef9c5d4d5903b48792050 (diff) | |
| parent | 6dab5c46b00f624c7900ff6d11b75bcafbe251d0 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/unpaper/PKGBUILD
community/virtualbox/PKGBUILD
core/crda/PKGBUILD
core/eventlog/PKGBUILD
extra/v86d/PKGBUILD
extra/vlc/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'testing/kismet/kismet-2008-05-R1-infinite-loop.diff')
| -rw-r--r-- | testing/kismet/kismet-2008-05-R1-infinite-loop.diff | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/testing/kismet/kismet-2008-05-R1-infinite-loop.diff b/testing/kismet/kismet-2008-05-R1-infinite-loop.diff new file mode 100644 index 000000000..f8417943e --- /dev/null +++ b/testing/kismet/kismet-2008-05-R1-infinite-loop.diff @@ -0,0 +1,20 @@ +--- gpsmap.cc ++++ gpsmap.cc +@@ -874,7 +874,7 @@ + + // Break up the path to the gpsxml file and form a path based on that + unsigned int lastslash = 0; +- for (unsigned int x = origxmlfile.find('/'); x != string::npos; ++ for (string::size_type x = origxmlfile.find('/'); x != string::npos; + lastslash = x, x = origxmlfile.find('/', lastslash+1)) { + // We don't actually need to do anything... + } +@@ -882,7 +882,7 @@ + comp = origxmlfile.substr(0, lastslash); + + lastslash = 0; +- for (unsigned int x = orignetfile.find('/'); x != string::npos; ++ for (string::size_type x = orignetfile.find('/'); x != string::npos; + lastslash = x, x = orignetfile.find('/', lastslash+1)) { + // We don't actually need to do anything... + } |