X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=options.c;h=5c3441dcb1019c7bb0b9c5237ec578fc20f7a204;hb=2e926c7be4f69d68064ffd62dfaa6d7013d3f9fa;hp=8a2fe5da91a30f93995dc00be59b23a2504a3aca;hpb=517f5529d7008eba87b8b2fee5ec9ec0a5075f6e;p=platform%2Fupstream%2Fltrace.git

diff --git a/options.c b/options.c
index 8a2fe5d..5c3441d 100644
--- a/options.c
+++ b/options.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of ltrace.
- * Copyright (C) 2012, 2013 Petr Machata, Red Hat Inc.
+ * Copyright (C) 2012, 2013, 2014 Petr Machata, Red Hat Inc.
  * Copyright (C) 2009,2010 Joe Damato
  * Copyright (C) 1998,1999,2002,2003,2004,2007,2008,2009 Juan Cespedes
  * Copyright (C) 2006 Ian Wienand
@@ -107,9 +107,9 @@ usage(void) {
 		"  -T                  show the time spent inside each call.\n"
 		"  -u USERNAME         run command with the userid, groupid of username.\n"
 		"  -V, --version       output version information and exit.\n"
-#if defined(HAVE_LIBUNWIND)
+#if defined(HAVE_UNWINDER)
 		"  -w, --where=NR      print backtrace showing NR stack frames at most.\n"
-#endif /* defined(HAVE_LIBUNWIND) */
+#endif /* defined(HAVE_UNWINDER) */
 		"  -x FILTER           modify which static functions to trace.\n"
 		"\nReport bugs to ltrace-devel@lists.alioth.debian.org\n",
 		progname);
@@ -128,6 +128,8 @@ usage_debug(void) {
 			"\n"
 			"Debugging options are mixed using bitwise-or.\n"
 			"Note that the meanings and values are subject to change.\n"
+			"Also note that these values are used inconsistently in ltrace, and the\n"
+			"only debuglevel that you can rely on is -D77 that will show everything.\n"
 		   );
 }
 
@@ -517,9 +519,9 @@ process_options(int argc, char **argv)
 	progname = argv[0];
 	options.output = stderr;
 	options.no_signals = 0;
-#if defined(HAVE_LIBUNWIND)
+#if defined(HAVE_UNWINDER)
 	options.bt_depth = -1;
-#endif /* defined(HAVE_LIBUNWIND) */
+#endif /* defined(HAVE_UNWINDER) */
 
 	guess_cols();
 
@@ -543,9 +545,9 @@ process_options(int argc, char **argv)
 			{"output", 1, 0, 'o'},
 			{"version", 0, 0, 'V'},
 			{"no-signals", 0, 0, 'b'},
-# if defined(HAVE_LIBUNWIND)
+# if defined(HAVE_UNWINDER)
 			{"where", 1, 0, 'w'},
-# endif /* defined(HAVE_LIBUNWIND) */
+# endif /* defined(HAVE_UNWINDER) */
 			{0, 0, 0, 0}
 		};
 #endif
@@ -554,10 +556,10 @@ process_options(int argc, char **argv)
 #ifdef USE_DEMANGLE
 			"C"
 #endif
-#if defined(HAVE_LIBUNWIND)
+#if defined(HAVE_UNWINDER)
 			"w:"
 #endif
-			"cfhiLrStTVba:A:D:e:F:l:n:o:p:s:u:x:X:";
+			"cfhiLrStTVba:A:D:e:F:l:n:o:p:s:u:x:";
 
 #ifdef HAVE_GETOPT_LONG
 		c = getopt_long(argc, argv, opts, long_options, &option_index);
@@ -679,11 +681,11 @@ process_options(int argc, char **argv)
 			       "There is NO WARRANTY, to the extent permitted by law.\n");
 			exit(0);
 			break;
-#if defined(HAVE_LIBUNWIND)
+#if defined(HAVE_UNWINDER)
 		case 'w':
 			options.bt_depth = parse_int(optarg, 'w', 1, 0);
 			break;
-#endif /* defined(HAVE_LIBUNWIND) */
+#endif /* defined(HAVE_UNWINDER) */
 
 		case 'x':
 			parse_filter_chain(optarg, &options.static_filter);