examples: call freenect_shutdown() on exit

This is mostly useful when using tools like valgrind, which may report possibly lost memory even if the operating systems is going to get it back anyway on the actual process exit. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
renewagner · Mar 10, 2012 · 6e6015c · 6e6015c
1 parent 071f51e
commit 6e6015c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/examples/glview.c b/examples/glview.c
@@ -421,17 +421,21 @@ int main(int argc, char **argv)
 	if (argc > 1)
 		user_device_number = atoi(argv[1]);
 
-	if (nr_devices < 1)
+	if (nr_devices < 1) {
+		freenect_shutdown(f_ctx);
 		return 1;
+	}
 
 	if (freenect_open_device(f_ctx, &f_dev, user_device_number) < 0) {
 		printf("Could not open device\n");
+		freenect_shutdown(f_ctx);
 		return 1;
 	}
 
 	res = pthread_create(&freenect_thread, NULL, freenect_threadfunc, NULL);
 	if (res) {
 		printf("pthread_create failed\n");
+		freenect_shutdown(f_ctx);
 		return 1;
 	}
 

diff --git a/examples/hiview.c b/examples/hiview.c
@@ -445,17 +445,21 @@ int main(int argc, char **argv)
 	if (argc > 1)
 		user_device_number = atoi(argv[1]);
 
-	if (nr_devices < 1)
+	if (nr_devices < 1) {
+		freenect_shutdown(f_ctx);
 		return 1;
+	}
 
 	if (freenect_open_device(f_ctx, &f_dev, user_device_number) < 0) {
 		printf("Could not open device\n");
+		freenect_shutdown(f_ctx);
 		return 1;
 	}
 
 	res = pthread_create(&freenect_thread, NULL, freenect_threadfunc, NULL);
 	if (res) {
 		printf("pthread_create failed\n");
+		freenect_shutdown(f_ctx);
 		return 1;
 	}
 

diff --git a/examples/micview.c b/examples/micview.c
@@ -161,12 +161,15 @@ int main(int argc, char** argv) {
 
 	int nr_devices = freenect_num_devices (f_ctx);
 	printf ("Number of devices found: %d\n", nr_devices);
-	if (nr_devices < 1)
+	if (nr_devices < 1) {
+		freenect_shutdown(f_ctx);
 		return 1;
+	}
 
 	int user_device_number = 0;
 	if (freenect_open_device(f_ctx, &f_dev, user_device_number) < 0) {
 		printf("Could not open device\n");
+		freenect_shutdown(f_ctx);
 		return 1;
 	}
 
@@ -188,6 +191,7 @@ int main(int argc, char** argv) {
 	int res = pthread_create(&freenect_thread, NULL, freenect_threadfunc, NULL);
 	if (res) {
 		printf("pthread_create failed\n");
+		freenect_shutdown(f_ctx);
 		return 1;
 	}
 	printf("This is the libfreenect microphone waveform viewer.  Press 'q' to quit or spacebar to pause/unpause the view.\n");

diff --git a/examples/regview.c b/examples/regview.c
@@ -363,17 +363,21 @@ int main(int argc, char **argv)
 	if (argc > 1)
 		user_device_number = atoi(argv[1]);
 
-	if (nr_devices < 1)
+	if (nr_devices < 1) {
+		freenect_shutdown(f_ctx);
 		return 1;
+	}
 
 	if (freenect_open_device(f_ctx, &f_dev, user_device_number) < 0) {
 		printf("Could not open device\n");
+		freenect_shutdown(f_ctx);
 		return 1;
 	}
 
 	res = pthread_create(&freenect_thread, NULL, freenect_threadfunc, NULL);
 	if (res) {
 		printf("pthread_create failed\n");
+		freenect_shutdown(f_ctx);
 		return 1;
 	}
 

diff --git a/examples/wavrecord.c b/examples/wavrecord.c
@@ -80,12 +80,15 @@ int main(int argc, char** argv) {
 
 	int nr_devices = freenect_num_devices (f_ctx);
 	printf ("Number of devices found: %d\n", nr_devices);
-	if (nr_devices < 1)
+	if (nr_devices < 1) {
+		freenect_shutdown(f_ctx);
 		return 1;
+	}
 
 	int user_device_number = 0;
 	if (freenect_open_device(f_ctx, &f_dev, user_device_number) < 0) {
 		printf("Could not open device\n");
+		freenect_shutdown(f_ctx);
 		return 1;
 	}
 
@@ -135,5 +138,6 @@ int main(int argc, char** argv) {
 		fclose(state.logfiles[i]);
 	}
 
+	freenect_shutdown(f_ctx);
 	return 0;
 }