X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=8f0b7faf7bba62b5318dfc54f1efa5df21c08da9;hb=7a391832ea3d70a71e00b76398259c5aa7d18541;hp=0ffcb3b6ab7e60a6fb44780413183803d923a462;hpb=823fa2fab52001dd39b07ea4c7d806b859f7ee9e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 0ffcb3b6a..8f0b7faf7 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -591,7 +591,6 @@ static int push_metadata(struct ust_registry_session *registry,
 	return 0;
 
 error:
-end:
 	return ret_val;
 }
 
@@ -4094,7 +4093,7 @@ static
 int ust_app_flush_session(struct ltt_ust_session *usess)
 
 {
-	int ret;
+	int ret = 0;
 
 	DBG("Flushing session buffers for all ust apps");
 
@@ -4135,7 +4134,6 @@ int ust_app_flush_session(struct ltt_ust_session *usess)
 			/* Push metadata. */
 			(void) push_metadata(ust_session_reg, usess->consumer);
 		}
-		ret = 0;
 		break;
 	}
 	case LTTNG_BUFFER_PER_PID:
@@ -4154,11 +4152,11 @@ int ust_app_flush_session(struct ltt_ust_session *usess)
 		break;
 	}
 	default:
+		ret = -1;
 		assert(0);
 		break;
 	}
 
-end_no_session:
 	rcu_read_unlock();
 	health_code_update();
 	return ret;