---

yaml --- r: 263063 b: refs/heads/master c: 13e27d7 h: refs/heads/master i: 263061: e3078b1 263059: 58d4a6e 263055: 1814bc3 v: v3
git-mirror · Aug 12, 2011 · f68106f · f68106f
1 parent 2bf0de4
commit f68106f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36c0c588b9ea979b619d6ddced410f9551e4c5fa
+refs/heads/master: 13e27d7686c457c625242fc2c20be30eef942408
diff --git a/trunk/tools/perf/builtin-probe.c b/trunk/tools/perf/builtin-probe.c
@@ -134,10 +134,18 @@ static int opt_show_lines(const struct option *opt __used,
 {
 	int ret = 0;
 
-	if (str)
-		ret = parse_line_range_desc(str, &params.line_range);
-	INIT_LIST_HEAD(&params.line_range.line_list);
+	if (!str)
+		return 0;
+
+	if (params.show_lines) {
+		pr_warning("Warning: more than one --line options are"
+			   " detected. Only the first one is valid.\n");
+		return 0;
+	}
+
 	params.show_lines = true;
+	ret = parse_line_range_desc(str, &params.line_range);
+	INIT_LIST_HEAD(&params.line_range.line_list);
 
 	return ret;
 }