Fixed rolling off end of args

1 files changed, 189 insertions, 233 deletions

diff --git a/src/survive.c b/src/survive.c
index 1b72745..2c9c15f 100755..100644
--- a/src/survive.c
+++ b/src/survive.c
@@ -1,11 +1,11 @@
-//Copyright 2016 <>< C. N. Lohr, FULLY Under MIT/x11 License.
-//All MIT/x11 Licensed Code in this file may be relicensed freely under the GPL or LGPL licenses.
+// Copyright 2016 <>< C. N. Lohr, FULLY Under MIT/x11 License.
+// All MIT/x11 Licensed Code in this file may be relicensed freely under the GPL or LGPL licenses.
 
-#include <survive.h>
 #include "survive_internal.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <survive.h>
 
 #include "os_generic.h"
 #include "survive_config.h"
@@ -18,10 +18,8 @@
 #ifdef RUNTIME_SYMNUM
 #include <symbol_enumerator.h>
 static int did_runtime_symnum;
-int SymnumCheck( const char * path, const char * name, void * location, long size )
-{
-	if( strncmp( name, "REGISTER", 8 ) == 0 )
-	{
+int SymnumCheck(const char *path, const char *name, void *location, long size) {
+	if (strncmp(name, "REGISTER", 8) == 0) {
 		typedef void (*sf)();
 		sf fn = (sf)location;
 		fn();
@@ -31,34 +29,26 @@ int SymnumCheck( const char * path, const char * name, void * location, long siz
 
 #endif
 
-static void survivefault( struct SurviveContext * ctx, const char * fault )
-{
-	fprintf( stderr, "Error: %s\n", fault );
-	exit( -1 );
+static void survivefault(struct SurviveContext *ctx, const char *fault) {
+	fprintf(stderr, "Error: %s\n", fault);
+	exit(-1);
 }
 
-static void survivenote( struct SurviveContext * ctx, const char * fault )
-{
-	fprintf( stderr, "Info: %s\n", fault );
-}
+static void survivenote(struct SurviveContext *ctx, const char *fault) { fprintf(stderr, "Info: %s\n", fault); }
 
-static void *button_servicer(void * context)
-{
-	SurviveContext *ctx = (SurviveContext*)context;
+static void *button_servicer(void *context) {
+	SurviveContext *ctx = (SurviveContext *)context;
 
-	while (1)
-	{
+	while (1) {
 		OGLockSema(ctx->buttonQueue.buttonservicesem);
 
-		if (ctx->state != SURVIVE_RUNNING)
-		{
+		if (ctx->state != SURVIVE_RUNNING) {
 			// we're shutting down.  Close.
 			return NULL;
 		}
 
 		ButtonQueueEntry *entry = &(ctx->buttonQueue.entry[ctx->buttonQueue.nextReadIndex]);
-		if (entry->isPopulated == 0)
-		{
+		if (entry->isPopulated == 0) {
 			// should never happen.  indicates failure of code pushing stuff onto
 			// the buttonQueue
 			// if it does happen, it will kill all future button input
@@ -66,7 +56,7 @@ static void *button_servicer(void * context)
 			return NULL;
 		}
 
-		//printf("ButtonEntry: eventType:%x, buttonId:%d, axis1:%d, axis1Val:%8.8x, axis2:%d, axis2Val:%8.8x\n",
+		// printf("ButtonEntry: eventType:%x, buttonId:%d, axis1:%d, axis1Val:%8.8x, axis2:%d, axis2Val:%8.8x\n",
 		//	entry->eventType,
 		//	entry->buttonId,
 		//	entry->axis1Id,
@@ -75,20 +65,13 @@ static void *button_servicer(void * context)
 		//	entry->axis2Val);
 
 		button_process_func butt_func = ctx->buttonproc;
-		if (butt_func)
-		{
-			butt_func(entry->so,
-				entry->eventType,
-				entry->buttonId,
-				entry->axis1Id,
-				entry->axis1Val,
-				entry->axis2Id,
-				entry->axis2Val);
+		if (butt_func) {
+			butt_func(entry->so, entry->eventType, entry->buttonId, entry->axis1Id, entry->axis1Val, entry->axis2Id,
+					  entry->axis2Val);
 		}
 
 		ctx->buttonQueue.nextReadIndex++;
-		if (ctx->buttonQueue.nextReadIndex >= BUTTON_QUEUE_MAX_LEN)
-		{
+		if (ctx->buttonQueue.nextReadIndex >= BUTTON_QUEUE_MAX_LEN) {
 			ctx->buttonQueue.nextReadIndex = 0;
 		}
 	};
@@ -96,27 +79,29 @@ static void *button_servicer(void * context)
 }
 
 void survive_verify_FLT_size(uint32_t user_size) {
-  if(sizeof(FLT) != user_size) {
-    fprintf(stderr, "FLT type incompatible; the shared library libsurvive has FLT size %lu vs user program %u\n", (unsigned long)sizeof(FLT), user_size);
-    fprintf(stderr, "Add '#define FLT %s' before including survive.h or recompile the shared library with the appropriate flag. \n",
-	    sizeof(FLT) == sizeof(double) ? "double" : "float");
-    exit(-1);
-  }
+	if (sizeof(FLT) != user_size) {
+		fprintf(stderr, "FLT type incompatible; the shared library libsurvive has FLT size %lu vs user program %u\n",
+				(unsigned long)sizeof(FLT), user_size);
+		fprintf(stderr, "Add '#define FLT %s' before including survive.h or recompile the shared library with the "
+						"appropriate flag. \n",
+				sizeof(FLT) == sizeof(double) ? "double" : "float");
+		exit(-1);
+	}
 }
 
-SurviveContext * survive_init_internal( int argc, char * const * argv )
-{
+SurviveContext *survive_init_internal(int argc, char *const *argv) {
 #ifdef RUNTIME_SYMNUM
-	if( !did_runtime_symnum )
-	{
-		EnumerateSymbols( SymnumCheck );
+	if (!did_runtime_symnum) {
+		EnumerateSymbols(SymnumCheck);
 		did_runtime_symnum = 1;
 	}
 #endif
 #ifdef MANUAL_REGISTRATION
-	// note: this manual registration is currently only in use on builds using Visual Studio.
+// note: this manual registration is currently only in use on builds using Visual Studio.
 
-#define MANUAL_DRIVER_REGISTRATION(func) int func( SurviveObject * so, PoserData * pd ); RegisterDriver( #func, &func);
+#define MANUAL_DRIVER_REGISTRATION(func)                                                                               \
+	int func(SurviveObject *so, PoserData *pd);                                                                        \
+	RegisterDriver(#func, &func);
 
 	MANUAL_DRIVER_REGISTRATION(PoserCharlesSlow)
 	MANUAL_DRIVER_REGISTRATION(PoserDaveOrtho)
@@ -124,74 +109,76 @@ SurviveContext * survive_init_internal( int argc, char * const * argv )
 	MANUAL_DRIVER_REGISTRATION(DriverRegHTCVive)
 #endif
 
-	SurviveContext * ctx = calloc( 1, sizeof( SurviveContext ) );
+	SurviveContext *ctx = calloc(1, sizeof(SurviveContext));
 
 	ctx->state = SURVIVE_STOPPED;
 
-	ctx->global_config_values = malloc( sizeof(config_group) );
-	ctx->temporary_config_values = malloc( sizeof(config_group) );
-	ctx->lh_config = malloc( sizeof(config_group) * NUM_LIGHTHOUSES);
+	ctx->global_config_values = malloc(sizeof(config_group));
+	ctx->temporary_config_values = malloc(sizeof(config_group));
+	ctx->lh_config = malloc(sizeof(config_group) * NUM_LIGHTHOUSES);
 
-	//initdata
-	init_config_group(ctx->global_config_values,10);
-	init_config_group(ctx->temporary_config_values,20);
-	init_config_group(&ctx->lh_config[0],10);
-	init_config_group(&ctx->lh_config[1],10);
+	// initdata
+	init_config_group(ctx->global_config_values, 10);
+	init_config_group(ctx->temporary_config_values, 20);
+	init_config_group(&ctx->lh_config[0], 10);
+	init_config_group(&ctx->lh_config[1], 10);
 
-	//Process command-line parameters.
+	// Process command-line parameters.
 	char *const *av = argv + 1;
-	char *const *argvend = av + argc;
+	char *const *argvend = argv + argc;
 	int showhelp = 0;
-	for( ; av != argvend; av++ )
-	{
-		if( (*av)[0] != '-' )
+	for (; av < argvend; av++) {
+		if ((*av)[0] != '-')
 			showhelp = 1;
-		else
-		{
-			const char * vartoupdate = 0;
-
-			switch( (*av)[1] )
-			{
-			case '-': vartoupdate = &(*av)[2];    break;
-			case 'h': showhelp = 1; break;
-			case 'p': vartoupdate = "defaultposer";	break;
-			case 'l': vartoupdate = "lighthousecount";  break;
-			case 'c': vartoupdate = "configfile";   break;
+		else {
+			const char *vartoupdate = 0;
+
+			switch ((*av)[1]) {
+			case '-':
+				vartoupdate = &(*av)[2];
+				break;
+			case 'h':
+				showhelp = 1;
+				break;
+			case 'p':
+				vartoupdate = "defaultposer";
+				break;
+			case 'l':
+				vartoupdate = "lighthousecount";
+				break;
+			case 'c':
+				vartoupdate = "configfile";
+				break;
 			default:
-				fprintf( stderr, "Error: unknown parameter %s\n", *av );
+				fprintf(stderr, "Error: unknown parameter %s\n", *av);
 				showhelp = 1;
 			}
 
-			if( vartoupdate )
-			{
-				if( av+1 == argvend )
-				{
-					fprintf( stderr, "Error: expected parameter after %s\n", *av );
+			if (vartoupdate) {
+				if (av + 1 == argvend) {
+					fprintf(stderr, "Error: expected parameter after %s\n", *av);
 					showhelp = 1;
-				}
-				else
-				{
-					survive_configs( ctx, *av+2, SC_OVERRIDE|SC_SET, *(av+1) );
+				} else {
+					survive_configs(ctx, *av + 2, SC_OVERRIDE | SC_SET, *(av + 1));
 					av++;
 				}
 			}
 		}
 	}
-	if( showhelp )
-	{
-		//Can't use SV_ERROR here since we don't have a context to send to yet.
-		fprintf( stderr, "libsurvive - usage:\n" );
-		fprintf( stderr, " --[parameter] [value]   - sets parameter\n" );
-		fprintf( stderr, " -h                      - shows help.\n" );
-		fprintf( stderr, " -p [poser]              - use a specific defaultposer.\n" );
-		fprintf( stderr, " -l [lighthouse count]   - use a specific number of lighthoses.\n" );
-		fprintf( stderr, " -c [config file]        - set config file\n" );
-		fprintf( stderr, " -p [lighthouse count]   - use a specific number of lighthoses.\n" );
+	if (showhelp) {
+		// Can't use SV_ERROR here since we don't have a context to send to yet.
+		fprintf(stderr, "libsurvive - usage:\n");
+		fprintf(stderr, " --[parameter] [value]   - sets parameter\n");
+		fprintf(stderr, " -h                      - shows help.\n");
+		fprintf(stderr, " -p [poser]              - use a specific defaultposer.\n");
+		fprintf(stderr, " -l [lighthouse count]   - use a specific number of lighthoses.\n");
+		fprintf(stderr, " -c [config file]        - set config file\n");
+		fprintf(stderr, " -p [lighthouse count]   - use a specific number of lighthoses.\n");
 		return 0;
 	}
 
-	config_read(ctx, survive_configs( ctx, "configfile", SC_GET, "config.json" ) );
-	ctx->activeLighthouses = survive_configi( ctx, "lighthousecount", SC_SETCONFIG, 2 );
+	config_read(ctx, survive_configs(ctx, "configfile", SC_GET, "config.json"));
+	ctx->activeLighthouses = survive_configi(ctx, "lighthousecount", SC_SETCONFIG, 2);
 
 	config_read_lighthouse(ctx->lh_config, &(ctx->bsd[0]), 0);
 	config_read_lighthouse(ctx->lh_config, &(ctx->bsd[1]), 1);
@@ -208,65 +195,60 @@ SurviveContext * survive_init_internal( int argc, char * const * argv )
 	return ctx;
 }
 
-int survive_startup( SurviveContext * ctx )
-{
+int survive_startup(SurviveContext *ctx) {
 	int r = 0;
 	int i = 0;
 
 	// initialize the button queue
 	memset(&(ctx->buttonQueue), 0, sizeof(ctx->buttonQueue));
-	ctx->buttonQueue.buttonservicesem = OGCreateSema();	
+	ctx->buttonQueue.buttonservicesem = OGCreateSema();
 
 	// start the thread to process button data
 	ctx->buttonservicethread = OGCreateThread(button_servicer, ctx);
 
-	const char * DriverName;
+	const char *DriverName;
 
-	//const char * PreferredPoser = survive_config_reads(ctx->global_config_values, "defaultposer", "PoserDummy");
-	const char * PreferredPoser = survive_configs( ctx, "defaultposer", SC_SETCONFIG, "PoserTurveyTori");
+	// const char * PreferredPoser = survive_config_reads(ctx->global_config_values, "defaultposer", "PoserDummy");
+	const char *PreferredPoser = survive_configs(ctx, "defaultposer", SC_SETCONFIG, "PoserTurveyTori");
 	PoserCB PreferredPoserCB = 0;
-	const char * FirstPoser = 0;
-	SV_INFO( "Available posers:" );
-	while( ( DriverName = GetDriverNameMatching( "Poser", i++ ) ) )
-	{
-		PoserCB p = GetDriver( DriverName );
-		if( !PreferredPoserCB ) PreferredPoserCB = p;
-		int ThisPoser = strcmp( DriverName, PreferredPoser ) == 0;
-		SV_INFO( "\t%c%s", ThisPoser?'*':' ', DriverName );
-		if( ThisPoser ) PreferredPoserCB = p;
+	const char *FirstPoser = 0;
+	SV_INFO("Available posers:");
+	while ((DriverName = GetDriverNameMatching("Poser", i++))) {
+		PoserCB p = GetDriver(DriverName);
+		if (!PreferredPoserCB)
+			PreferredPoserCB = p;
+		int ThisPoser = strcmp(DriverName, PreferredPoser) == 0;
+		SV_INFO("\t%c%s", ThisPoser ? '*' : ' ', DriverName);
+		if (ThisPoser)
+			PreferredPoserCB = p;
 	}
-	SV_INFO( "Totals %d posers.  Using selected poser (or first!).", i-1 );
-	if( !PreferredPoserCB )
-	{
-		SV_ERROR( "Error.  Cannot find any valid poser." );
+	SV_INFO("Totals %d posers.  Using selected poser (or first!).", i - 1);
+	if (!PreferredPoserCB) {
+		SV_ERROR("Error.  Cannot find any valid poser.");
 	}
 
 	i = 0;
-	while( ( DriverName = GetDriverNameMatching( "DriverReg", i++ ) ) )
-	{
-		DeviceDriver dd = GetDriver( DriverName );
-		SV_INFO( "Loading driver %s (%p) (%d)", DriverName, dd, i );
-		r = dd( ctx );
-		SV_INFO( "Driver %s reports status %d", DriverName, r );
+	while ((DriverName = GetDriverNameMatching("DriverReg", i++))) {
+		DeviceDriver dd = GetDriver(DriverName);
+		SV_INFO("Loading driver %s (%p) (%d)", DriverName, dd, i);
+		r = dd(ctx);
+		SV_INFO("Driver %s reports status %d", DriverName, r);
 	}
-	//Apply poser to objects.
-	for( i = 0; i < ctx->objs_ct; i++ )
-	{
+	// Apply poser to objects.
+	for (i = 0; i < ctx->objs_ct; i++) {
 		ctx->objs[i]->PoserFn = PreferredPoserCB;
 	}
 
 	// saving the config extra to make sure that the user has a config file they can change.
-	config_save(ctx, survive_configs( ctx, "configfile", SC_GET, "config.json" ) );
+	config_save(ctx, survive_configs(ctx, "configfile", SC_GET, "config.json"));
 
 	ctx->state = SURVIVE_RUNNING;
 
 	return 0;
 }
 
-
-void survive_install_info_fn( SurviveContext * ctx,  text_feedback_func fbp )
-{
-	if( fbp )
+void survive_install_info_fn(SurviveContext *ctx, text_feedback_func fbp) {
+	if (fbp)
 		ctx->notefunction = fbp;
 	else
 		ctx->notefunction = survivenote;
@@ -279,49 +261,42 @@ void survive_install_htc_config_fn(SurviveContext *ctx, htc_config_func fbp) {
 		ctx->configfunction = survive_default_htc_config_process;
 }
 
-void survive_install_error_fn( SurviveContext * ctx,  text_feedback_func fbp )
-{
-	if( fbp )
+void survive_install_error_fn(SurviveContext *ctx, text_feedback_func fbp) {
+	if (fbp)
 		ctx->faultfunction = fbp;
 	else
 		ctx->faultfunction = survivefault;
 }
 
-void survive_install_light_fn( SurviveContext * ctx, light_process_func fbp )
-{
-	if( fbp )
+void survive_install_light_fn(SurviveContext *ctx, light_process_func fbp) {
+	if (fbp)
 		ctx->lightproc = fbp;
 	else
 		ctx->lightproc = survive_default_light_process;
 }
 
-void survive_install_imu_fn( SurviveContext * ctx,  imu_process_func fbp )
-{
-	if( fbp )
+void survive_install_imu_fn(SurviveContext *ctx, imu_process_func fbp) {
+	if (fbp)
 		ctx->imuproc = fbp;
 	else
 		ctx->imuproc = survive_default_imu_process;
 }
 
-
-void survive_install_angle_fn( SurviveContext * ctx,  angle_process_func fbp )
-{
-	if( fbp )
+void survive_install_angle_fn(SurviveContext *ctx, angle_process_func fbp) {
+	if (fbp)
 		ctx->angleproc = fbp;
 	else
 		ctx->angleproc = survive_default_angle_process;
 }
 
-void survive_install_button_fn(SurviveContext * ctx, button_process_func fbp)
-{
+void survive_install_button_fn(SurviveContext *ctx, button_process_func fbp) {
 	if (fbp)
 		ctx->buttonproc = fbp;
 	else
 		ctx->buttonproc = survive_default_button_process;
 }
 
-void survive_install_raw_pose_fn(SurviveContext * ctx, raw_pose_func fbp)
-{
+void survive_install_raw_pose_fn(SurviveContext *ctx, raw_pose_func fbp) {
 	if (fbp)
 		ctx->rawposeproc = fbp;
 	else
@@ -335,35 +310,32 @@ void survive_install_lighthouse_pose_fn(SurviveContext *ctx, lighthouse_pose_fun
 		ctx->lighthouseposeproc = survive_default_lighthouse_pose_process;
 }
 
-int survive_add_object( SurviveContext * ctx, SurviveObject * obj )
-{
+int survive_add_object(SurviveContext *ctx, SurviveObject *obj) {
 	int oldct = ctx->objs_ct;
-	ctx->objs = realloc( ctx->objs, sizeof( SurviveObject * ) * (oldct+1) );
+	ctx->objs = realloc(ctx->objs, sizeof(SurviveObject *) * (oldct + 1));
 	ctx->objs[oldct] = obj;
-	ctx->objs_ct = oldct+1;
+	ctx->objs_ct = oldct + 1;
 	return 0;
 }
 
-void survive_add_driver( SurviveContext * ctx, void * payload, DeviceDriverCb poll, DeviceDriverCb close, DeviceDriverMagicCb magic )
-{
+void survive_add_driver(SurviveContext *ctx, void *payload, DeviceDriverCb poll, DeviceDriverCb close,
+						DeviceDriverMagicCb magic) {
 	int oldct = ctx->driver_ct;
-	ctx->drivers = realloc( ctx->drivers, sizeof( void * ) * (oldct+1) );
-	ctx->driverpolls = realloc( ctx->driverpolls, sizeof( DeviceDriverCb * ) * (oldct+1) );
-	ctx->drivercloses = realloc( ctx->drivercloses, sizeof( DeviceDriverCb * ) * (oldct+1) );
-	ctx->drivermagics = realloc( ctx->drivermagics, sizeof( DeviceDriverMagicCb * ) * (oldct+1) );
+	ctx->drivers = realloc(ctx->drivers, sizeof(void *) * (oldct + 1));
+	ctx->driverpolls = realloc(ctx->driverpolls, sizeof(DeviceDriverCb *) * (oldct + 1));
+	ctx->drivercloses = realloc(ctx->drivercloses, sizeof(DeviceDriverCb *) * (oldct + 1));
+	ctx->drivermagics = realloc(ctx->drivermagics, sizeof(DeviceDriverMagicCb *) * (oldct + 1));
 	ctx->drivers[oldct] = payload;
 	ctx->driverpolls[oldct] = poll;
 	ctx->drivercloses[oldct] = close;
 	ctx->drivermagics[oldct] = magic;
-	ctx->driver_ct = oldct+1;
+	ctx->driver_ct = oldct + 1;
 }
 
-int survive_send_magic( SurviveContext * ctx, int magic_code, void * data, int datalen )
-{
+int survive_send_magic(SurviveContext *ctx, int magic_code, void *data, int datalen) {
 	int oldct = ctx->driver_ct;
 	int i;
-	for( i = 0; i < oldct; i++ )
-	{
+	for (i = 0; i < oldct; i++) {
 		if (ctx->drivermagics[i]) {
 			ctx->drivermagics[i](ctx, ctx->drivers[i], magic_code, data, datalen);
 		}
@@ -371,20 +343,16 @@ int survive_send_magic( SurviveContext * ctx, int magic_code, void * data, int d
 	return 0;
 }
 
-int survive_haptic(SurviveObject * so, uint8_t reserved, uint16_t pulseHigh, uint16_t pulseLow, uint16_t repeatCount)
-{
-	if (NULL == so || NULL == so->haptic)
-	{
+int survive_haptic(SurviveObject *so, uint8_t reserved, uint16_t pulseHigh, uint16_t pulseLow, uint16_t repeatCount) {
+	if (NULL == so || NULL == so->haptic) {
 		return -404;
 	}
 
 	return so->haptic(so, reserved, pulseHigh, pulseLow, repeatCount);
 }
 
-
-void survive_close( SurviveContext * ctx )
-{
-	const char * DriverName;
+void survive_close(SurviveContext *ctx) {
+	const char *DriverName;
 	int r = 0;
 
 	ctx->state = SURVIVE_CLOSING;
@@ -392,32 +360,28 @@ void survive_close( SurviveContext * ctx )
 	// unlock/ post to button service semaphore so the thread can kill itself
 	OGUnlockSema(ctx->buttonQueue.buttonservicesem);
 
-	while( ( DriverName = GetDriverNameMatching( "DriverUnreg", r++ ) ) )
-	{
-		DeviceDriver dd = GetDriver( DriverName );
-		SV_INFO( "De-registering driver %s (%p)", DriverName, dd );
-		r = dd( ctx );
-		SV_INFO( "Driver %s reports status %d", DriverName, r );
+	while ((DriverName = GetDriverNameMatching("DriverUnreg", r++))) {
+		DeviceDriver dd = GetDriver(DriverName);
+		SV_INFO("De-registering driver %s (%p)", DriverName, dd);
+		r = dd(ctx);
+		SV_INFO("Driver %s reports status %d", DriverName, r);
 	}
 
 	int oldct = ctx->driver_ct;
 	int i;
 
-	for( i = 0; i < ctx->objs_ct; i++ )
-	{
+	for (i = 0; i < ctx->objs_ct; i++) {
 		PoserData pd;
 		pd.pt = POSERDATA_DISASSOCIATE;
 		if (ctx->objs[i]->PoserFn)
 			ctx->objs[i]->PoserFn(ctx->objs[i], &pd);
 	}
 
-	for( i = 0; i < oldct; i++ )
-	{
-		ctx->drivercloses[i]( ctx, ctx->drivers[i] );
+	for (i = 0; i < oldct; i++) {
+		ctx->drivercloses[i](ctx, ctx->drivers[i]);
 	}
 
-
-	config_save(ctx, survive_configs( ctx, "configfile", SC_GET, "config.json" ) );
+	config_save(ctx, survive_configs(ctx, "configfile", SC_GET, "config.json"));
 
 	destroy_config_group(ctx->global_config_values);
 	destroy_config_group(ctx->temporary_config_values);
@@ -427,46 +391,41 @@ void survive_close( SurviveContext * ctx )
 		free(ctx->objs[i]);
 	}
 
-	free( ctx->objs );
-	free( ctx->drivers );
-	free( ctx->driverpolls );
-	free( ctx->drivermagics );
-	free( ctx->drivercloses );
-	free( ctx->global_config_values );
-	free( ctx->temporary_config_values );
-	free( ctx->lh_config );
+	free(ctx->objs);
+	free(ctx->drivers);
+	free(ctx->driverpolls);
+	free(ctx->drivermagics);
+	free(ctx->drivercloses);
+	free(ctx->global_config_values);
+	free(ctx->temporary_config_values);
+	free(ctx->lh_config);
 
-	free( ctx );
+	free(ctx);
 }
 
-int survive_poll( struct SurviveContext * ctx )
-{
+int survive_poll(struct SurviveContext *ctx) {
 	int i, r;
-	if( ctx->state == SURVIVE_STOPPED )
-	{
-		r = survive_startup( ctx );
-		if( r )
+	if (ctx->state == SURVIVE_STOPPED) {
+		r = survive_startup(ctx);
+		if (r)
 			return r;
 	}
 
 	int oldct = ctx->driver_ct;
 
-	for( i = 0; i < oldct; i++ )
-	{
-		r = ctx->driverpolls[i]( ctx, ctx->drivers[i] );
-		if( r ) return r;
+	for (i = 0; i < oldct; i++) {
+		r = ctx->driverpolls[i](ctx, ctx->drivers[i]);
+		if (r)
+			return r;
 	}
 
 	return 0;
 }
 
-
-struct SurviveObject * survive_get_so_by_name( struct SurviveContext * ctx, const char * name )
-{
+struct SurviveObject *survive_get_so_by_name(struct SurviveContext *ctx, const char *name) {
 	int i;
-	for( i = 0; i < ctx->objs_ct; i++ )
-	{
-		if( strcmp( ctx->objs[i]->codename, name ) == 0 )
+	for (i = 0; i < ctx->objs_ct; i++) {
+		if (strcmp(ctx->objs[i]->codename, name) == 0)
 			return ctx->objs[i];
 	}
 	return 0;
@@ -476,45 +435,42 @@ struct SurviveObject * survive_get_so_by_name( struct SurviveContext * ctx, cons
 
 #include <puff.h>
 
-		
-int survive_simple_inflate( struct SurviveContext * ctx, const char * input, int inlen, char * output, int outlen )
-{
-	//Tricky: we actually get 2 bytes of data on the front.  I don't know what it's for. 0x78 0x9c - puff doesn't deal with it well.
+int survive_simple_inflate(struct SurviveContext *ctx, const char *input, int inlen, char *output, int outlen) {
+	// Tricky: we actually get 2 bytes of data on the front.  I don't know what it's for. 0x78 0x9c - puff doesn't deal
+	// with it well.
 	unsigned long ol = outlen;
-	unsigned long il = inlen-2;
-	int ret = puff( output, &ol, input+2, &il );
-	if( ret == 0 )
+	unsigned long il = inlen - 2;
+	int ret = puff(output, &ol, input + 2, &il);
+	if (ret == 0)
 		return ol;
-	else
-	{
-		SV_INFO( "puff returned error code %d\n", ret );
+	else {
+		SV_INFO("puff returned error code %d\n", ret);
 		return -5;
 	}
 }
- 
+
 #else
-	
+
 #include <zlib.h>
 
-int survive_simple_inflate( struct SurviveContext * ctx, const char * input, int inlen, char * output, int outlen )
-{
-	z_stream zs; //Zlib stream.  May only be used by configuration at beginning and by USB thread periodically.
-	memset( &zs, 0, sizeof( zs ) );
-	inflateInit( &zs ); ///Consider checking error
+int survive_simple_inflate(struct SurviveContext *ctx, const char *input, int inlen, char *output, int outlen) {
+	z_stream zs; // Zlib stream.  May only be used by configuration at beginning and by USB thread periodically.
+	memset(&zs, 0, sizeof(zs));
+	inflateInit(&zs); /// Consider checking error
 
-	//XXX: Todo: If we find that this is not useful past the beginning (nix this here and move into the configuration getter)
-    zs.avail_in = inlen;
-    zs.next_in = (z_const Bytef *)input;
-    zs.avail_out = outlen;
+	// XXX: Todo: If we find that this is not useful past the beginning (nix this here and move into the configuration
+	// getter)
+	zs.avail_in = inlen;
+	zs.next_in = (z_const Bytef *)input;
+	zs.avail_out = outlen;
 	zs.next_out = output;
 
-    if( inflate( &zs, Z_FINISH) != Z_STREAM_END )
-	{
-        SV_INFO("survive_simple_inflate could not inflate." );
-        return -1;
+	if (inflate(&zs, Z_FINISH) != Z_STREAM_END) {
+		SV_INFO("survive_simple_inflate could not inflate.");
+		return -1;
 	}
 	int len = zs.total_out;
-	inflateEnd( &zs );
+	inflateEnd(&zs);
 	return len;
 }