From: David Goulet <dgoulet@efficios.com>
Date: Thu, 2 Feb 2012 15:26:45 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre19~8
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=baa81d3ac6e60bf3caf261342e10a7f85e87e23a;hp=-c;p=lttng-tools.git

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

baa81d3ac6e60bf3caf261342e10a7f85e87e23a
diff --combined src/bin/lttng/commands/list.c
index 250e4d8f6,f915a1685..3bac86ecd
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@@ -176,13 -176,13 +176,13 @@@ static const char *loglevel_string(int 
  	case 5: return "TRACE_NOTICE";
  	case 6: return "TRACE_INFO";
  	case 7: return "TRACE_SYSTEM";
- 	case 8: return "TRACE_PROCESS";
- 	case 9: return "TRACE_MODULE";
- 	case 10: return "TRACE_UNIT";
- 	case 11: return "TRACE_CLASS";
- 	case 12: return "TRACE_OBJECT";
- 	case 13: return "TRACE_FUNCTION";
- 	case 14: return "TRACE_PRINTF";
+ 	case 8: return "TRACE_PROGRAM";
+ 	case 9: return "TRACE_PROCESS";
+ 	case 10: return "TRACE_MODULE";
+ 	case 11: return "TRACE_UNIT";
+ 	case 12: return "TRACE_FUNCTION";
+ 	case 13: return "TRACE_DEFAULT";
+ 	case 14: return "TRACE_VERBOSE";
  	case 15: return "TRACE_DEBUG";
  	default: return "<<UNKNOWN>>";
  	}
@@@ -602,18 -602,21 +602,18 @@@ int cmd_list(int argc, const char **arg
  		if (!opt_kernel && !opt_userspace) {
  			ret = list_sessions(NULL);
  			if (ret < 0) {
 -				ret = CMD_ERROR;
  				goto end;
  			}
  		}
  		if (opt_kernel) {
  			ret = list_kernel_events();
  			if (ret < 0) {
 -				ret = CMD_ERROR;
  				goto end;
  			}
  		}
  		if (opt_userspace) {
  			ret = list_ust_events();
  			if (ret < 0) {
 -				ret = CMD_ERROR;
  				goto end;
  			}
  		}
@@@ -621,12 -624,16 +621,12 @@@
  		/* List session attributes */
  		ret = list_sessions(session_name);
  		if (ret < 0) {
 -			ret = CMD_ERROR;
  			goto end;
  		}
  
  		/* Domain listing */
  		if (opt_domain) {
  			ret = list_domains(session_name);
 -			if (ret < 0) {
 -				ret = CMD_ERROR;
 -			}
  			goto end;
  		}
  
@@@ -634,13 -641,14 +634,13 @@@
  			/* Channel listing */
  			ret = list_channels(opt_channel);
  			if (ret < 0) {
 -				ret = CMD_ERROR;
  				goto end;
  			}
  		} else {
  			/* We want all domain(s) */
  			nb_domain = lttng_list_domains(session_name, &domains);
  			if (nb_domain < 0) {
 -				ret = CMD_ERROR;
 +				ret = nb_domain;
  				goto end;
  			}
  
@@@ -668,6 -676,7 +668,6 @@@
  
  				ret = list_channels(opt_channel);
  				if (ret < 0) {
 -					ret = CMD_ERROR;
  					goto end;
  				}
  			}