FIX - ft_warning was not giving warnings correctly due to incorrect

robertoostenveld · robertoostenveld · commit df39047ecf04 · 2016-03-04T14:32:24.000+01:00
stack checking
diff --git a/bin/synchronize-private.sh b/bin/synchronize-private.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ################################################################################
 #
 # This Bash script synchronizes multiple copies of the same file in the repository.
diff --git a/connectivity/private/ft_warning.m b/connectivity/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/engine/private/ft_warning.m b/engine/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/fileio/private/ft_warning.m b/fileio/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/forward/private/ft_warning.m b/forward/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/plotting/private/ft_warning.m b/plotting/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/preproc/private/ft_warning.m b/preproc/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/qsub/private/ft_warning.m b/qsub/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/specest/private/ft_warning.m b/specest/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/statfun/private/ft_warning.m b/statfun/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/test/private/ft_warning.m b/test/private/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end
diff --git a/test/test_warning_once.m b/test/test_warning_once.m
@@ -1,4 +1,4 @@
-function test_ft_warning
+function test_warning_once
 
 % MEM 1500mb
 % WALLTIME 00:10:00
diff --git a/utilities/ft_warning.m b/utilities/ft_warning.m
@@ -58,7 +58,7 @@
 ws = [];
 
 stack = dbstack;
-if any(strcmp({stack.file}, 'ft_warning.m'))
+if any(strcmp({stack(2:end).file}, 'ft_warning.m'))
   % don't call FT_WARNING recursively, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3068
   return;
 end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`	`################################################################################`
`3`	`3`	`#`
`4`	`4`	`# This Bash script synchronizes multiple copies of the same file in the repository.`