Merge pull request #1927 from tonytheodore/cleanup-style

Style cleanup

13 files changed, 130 insertions, 130 deletions

diff --git a/src/djvulibre-test.c b/src/djvulibre-test.c
index ff46691..604e0e7 100644
--- a/src/djvulibre-test.c
+++ b/src/djvulibre-test.c
@@ -6,11 +6,11 @@
 
 int main(int argc, char *argv[])
 {
-	ddjvu_context_t *djvu_test;
-	(void)argc;
+    ddjvu_context_t *djvu_test;
+    (void)argc;
 
-	djvu_test = ddjvu_context_create(argv[0]);
-	ddjvu_context_release(djvu_test);
+    djvu_test = ddjvu_context_create(argv[0]);
+    ddjvu_context_release(djvu_test);
 
-	return 0;
+    return 0;
 }
diff --git a/src/gdal.mk b/src/gdal.mk
index fa968f4..124e075 100644
--- a/src/gdal.mk
+++ b/src/gdal.mk
@@ -12,7 +12,7 @@ $(PKG)_URL      := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FIL
 $(PKG)_URL_2    := ftp://ftp.remotesensing.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc armadillo curl expat geos giflib gta hdf4 hdf5 \
                    jpeg json-c libgeotiff libmysqlclient libpng libxml2 \
-                   netcdf openjpeg postgresql proj sqlite tiff zlib spatialite
+                   netcdf openjpeg postgresql proj spatialite sqlite tiff zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://trac.osgeo.org/gdal/wiki/DownloadSource' | \
diff --git a/src/ghostscript-test.c b/src/ghostscript-test.c
index 92dad40..f7101b6 100644
--- a/src/ghostscript-test.c
+++ b/src/ghostscript-test.c
@@ -26,20 +26,20 @@ void *minst;
 
 int main(int argc, char *argv[])
 {
-	int code;
+    int code;
 
-	(void)argc;
-	(void)argv;
+    (void)argc;
+    (void)argv;
 
-	code = gsapi_new_instance(&minst, 0);
-	if (code < 0)
-		return 1;
+    code = gsapi_new_instance(&minst, 0);
+    if (code < 0)
+        return 1;
 
-	code = gsapi_exit(minst);
-	if (code < 0)
-		return 1;
+    code = gsapi_exit(minst);
+    if (code < 0)
+        return 1;
 
-	gsapi_delete_instance(minst);
+    gsapi_delete_instance(minst);
 
-	return 0;
+    return 0;
 }
diff --git a/src/hamlib-test.c b/src/hamlib-test.c
index ee382f7..98c5fa4 100644
--- a/src/hamlib-test.c
+++ b/src/hamlib-test.c
@@ -8,99 +8,99 @@
 #include <hamlib/riglist.h>
 
 int main(int argc, char *argv[]) {
-	RIG *my_rig;
-	char *rig_file, *info_buf, *mm;
-	freq_t freq;
-	value_t rawstrength, power, strength;
-	float s_meter, rig_raw2val();
-	int status, retcode, isz;
-	unsigned int mwpower;
-	rmode_t mode;
-	pbwidth_t width;
-	rig_model_t myrig_model;
-	char portname[64];
-	port_t myport;
+    RIG *my_rig;
+    char *rig_file, *info_buf, *mm;
+    freq_t freq;
+    value_t rawstrength, power, strength;
+    float s_meter, rig_raw2val();
+    int status, retcode, isz;
+    unsigned int mwpower;
+    rmode_t mode;
+    pbwidth_t width;
+    rig_model_t myrig_model;
+    char portname[64];
+    port_t myport;
 
-	strncpy(portname, argv[2], 63);
-	portname[63] = '\0';
+    strncpy(portname, argv[2], 63);
+    portname[63] = '\0';
 
-	if ((strcmp(argv[2], "--help") == 0) || (argc < 2)) {
-		printf("use like: ./%s <portname>\n", argv[0]);
-		printf("example:  ./%s /dev/ttyS0\n", argv[0]);
-		return 0;
-	}
+    if ((strcmp(argv[2], "--help") == 0) || (argc < 2)) {
+        printf("use like: ./%s <portname>\n", argv[0]);
+        printf("example:  ./%s /dev/ttyS0\n", argv[0]);
+        return 0;
+    }
 
-	/* Try to detect rig */
-	/* may be overridden by backend probe */
-	myport.type.rig = RIG_PORT_SERIAL;
-	myport.parm.serial.rate = 9600;
-	myport.parm.serial.data_bits = 8;
-	myport.parm.serial.stop_bits = 1;
-	myport.parm.serial.parity = RIG_PARITY_NONE;
-	myport.parm.serial.handshake = RIG_HANDSHAKE_NONE;
-	strncpy(myport.pathname, portname, FILPATHLEN);
+    /* Try to detect rig */
+    /* may be overridden by backend probe */
+    myport.type.rig = RIG_PORT_SERIAL;
+    myport.parm.serial.rate = 9600;
+    myport.parm.serial.data_bits = 8;
+    myport.parm.serial.stop_bits = 1;
+    myport.parm.serial.parity = RIG_PARITY_NONE;
+    myport.parm.serial.handshake = RIG_HANDSHAKE_NONE;
+    strncpy(myport.pathname, portname, FILPATHLEN);
 
-	rig_load_all_backends();
-	myrig_model = rig_probe(&myport);
-	/* Set verbosity level - errors only */
-	rig_set_debug(RIG_DEBUG_ERR);
-	/* Instantiate a rig - your rig */
-	/* my_rig = rig_init(RIG_MODEL_TT565); */
-	my_rig = rig_init(myrig_model);
-	/* Set up serial port, baud rate - serial device + baudrate */
-	rig_file = "/dev/ttyUSB0";
-	strncpy(my_rig->state.rigport.pathname, rig_file, FILPATHLEN - 1);
-	my_rig->state.rigport.parm.serial.rate = 57600;
-	my_rig->state.rigport.parm.serial.rate = 9600;
-	/* Open my rig */
-	retcode = rig_open(my_rig);
-	printf("retcode of rig_open = %d \n", retcode);
-	/* Give me ID info, e.g., firmware version. */
-	info_buf = (char *)rig_get_info(my_rig);
-	printf("Rig_info: '%s'\n", info_buf);
+    rig_load_all_backends();
+    myrig_model = rig_probe(&myport);
+    /* Set verbosity level - errors only */
+    rig_set_debug(RIG_DEBUG_ERR);
+    /* Instantiate a rig - your rig */
+    /* my_rig = rig_init(RIG_MODEL_TT565); */
+    my_rig = rig_init(myrig_model);
+    /* Set up serial port, baud rate - serial device + baudrate */
+    rig_file = "/dev/ttyUSB0";
+    strncpy(my_rig->state.rigport.pathname, rig_file, FILPATHLEN - 1);
+    my_rig->state.rigport.parm.serial.rate = 57600;
+    my_rig->state.rigport.parm.serial.rate = 9600;
+    /* Open my rig */
+    retcode = rig_open(my_rig);
+    printf("retcode of rig_open = %d \n", retcode);
+    /* Give me ID info, e.g., firmware version. */
+    info_buf = (char *)rig_get_info(my_rig);
+    printf("Rig_info: '%s'\n", info_buf);
 
-	/* Note: As a general practice, we should check to see if a given
-	 * function is within the rig's capabilities before calling it, but
-	 * we are simplifying here. Also, we should check each call's returned
-	 * status in case of error. (That's an inelegant way to catch an unsupported
-	 * operation.)
-	 */
+    /* Note: As a general practice, we should check to see if a given
+     * function is within the rig's capabilities before calling it, but
+     * we are simplifying here. Also, we should check each call's returned
+     * status in case of error. (That's an inelegant way to catch an unsupported
+     * operation.)
+     */
 
-	/* Main VFO frequency */
-	status = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
-	printf("status of rig_get_freq = %d \n", status);
-	printf("VFO freq. = %.1f Hz\n", freq);
-	/* Current mode */
-	status = rig_get_mode(my_rig, RIG_VFO_CURR, &mode, &width);
-	printf("status of rig_get_mode = %d \n", status);
-	switch(mode) {
-		case RIG_MODE_USB: mm = "USB"; break;
-		case RIG_MODE_LSB: mm = "LSB"; break;
-		case RIG_MODE_CW:  mm = "CW"; break;
-		case RIG_MODE_CWR: mm = "CWR"; break;
-		case RIG_MODE_AM:  mm = "AM"; break;
-		case RIG_MODE_FM:  mm = "FM"; break;
-		case RIG_MODE_WFM: mm = "WFM"; break;
-		case RIG_MODE_RTTY:mm = "RTTY"; break;
-		default: mm = "unrecognized"; break; /* there are more possibilities! */
-		}
-	printf("Current mode = 0x%X = %s, width = %d\n", mode, mm, (int) width);
-	/* rig power output */
-	status = rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_RFPOWER, &power);
-	printf("RF Power relative setting = %.3f (0.0 - 1.0)\n", power.f);
-	/* Convert power reading to watts */
-	status = rig_power2mW(my_rig, &mwpower, power.f, freq, mode);
-	printf("RF Power calibrated = %.1f Watts\n", mwpower/1000.);
-	/* Raw and calibrated S-meter values */
-	status = rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_RAWSTR, &rawstrength);
-	printf("Raw receive strength = %d\n", rawstrength.i);
-	isz = my_rig->caps->str_cal.size;
-	printf("isz = %d \n", isz);
-	s_meter = rig_raw2val(rawstrength.i, &my_rig->caps->str_cal);
-	printf("S-meter value = %.2f dB relative to S9\n", s_meter);
-	/* now try using RIG_LEVEL_STRENGTH itself */
-	status = rig_get_strength(my_rig, RIG_VFO_CURR, &strength);
-	printf("status of rig_get_strength = %d \n", status);
-	printf("LEVEL_STRENGTH returns %d\n", strength.i);
+    /* Main VFO frequency */
+    status = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
+    printf("status of rig_get_freq = %d \n", status);
+    printf("VFO freq. = %.1f Hz\n", freq);
+    /* Current mode */
+    status = rig_get_mode(my_rig, RIG_VFO_CURR, &mode, &width);
+    printf("status of rig_get_mode = %d \n", status);
+    switch(mode) {
+        case RIG_MODE_USB: mm = "USB"; break;
+        case RIG_MODE_LSB: mm = "LSB"; break;
+        case RIG_MODE_CW:  mm = "CW"; break;
+        case RIG_MODE_CWR: mm = "CWR"; break;
+        case RIG_MODE_AM:  mm = "AM"; break;
+        case RIG_MODE_FM:  mm = "FM"; break;
+        case RIG_MODE_WFM: mm = "WFM"; break;
+        case RIG_MODE_RTTY:mm = "RTTY"; break;
+        default: mm = "unrecognized"; break; /* there are more possibilities! */
+        }
+    printf("Current mode = 0x%X = %s, width = %d\n", mode, mm, (int) width);
+    /* rig power output */
+    status = rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_RFPOWER, &power);
+    printf("RF Power relative setting = %.3f (0.0 - 1.0)\n", power.f);
+    /* Convert power reading to watts */
+    status = rig_power2mW(my_rig, &mwpower, power.f, freq, mode);
+    printf("RF Power calibrated = %.1f Watts\n", mwpower/1000.);
+    /* Raw and calibrated S-meter values */
+    status = rig_get_level(my_rig, RIG_VFO_CURR, RIG_LEVEL_RAWSTR, &rawstrength);
+    printf("Raw receive strength = %d\n", rawstrength.i);
+    isz = my_rig->caps->str_cal.size;
+    printf("isz = %d \n", isz);
+    s_meter = rig_raw2val(rawstrength.i, &my_rig->caps->str_cal);
+    printf("S-meter value = %.2f dB relative to S9\n", s_meter);
+    /* now try using RIG_LEVEL_STRENGTH itself */
+    status = rig_get_strength(my_rig, RIG_VFO_CURR, &strength);
+    printf("status of rig_get_strength = %d \n", status);
+    printf("LEVEL_STRENGTH returns %d\n", strength.i);
 return 0;
 }
diff --git a/src/hdf-eos2.mk b/src/hdf-eos2.mk
index 7ead9bc..700eea0 100644
--- a/src/hdf-eos2.mk
+++ b/src/hdf-eos2.mk
@@ -22,7 +22,7 @@ define $(PKG)_BUILD
     cd '$(1)' && \
         ac_cv_func_malloc_0_nonnull=yes \
         ac_cv_func_realloc_0_nonnull=yes \
-	./configure $(MXE_CONFIGURE_OPTS) \
+    ./configure $(MXE_CONFIGURE_OPTS) \
         --enable-install-include
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'
diff --git a/src/libcddb.mk b/src/libcddb.mk
index fc1f93d..8a94450 100644
--- a/src/libcddb.mk
+++ b/src/libcddb.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/libcddb/libcddb/$($(PKG)_VERSION)/$(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_DEPS     := gcc libiconv libgnurx
+$(PKG)_DEPS     := gcc libgnurx libiconv
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://downloads.sourceforge.net/project/libcddb/libcddb/' | \
diff --git a/src/libspectre-test.c b/src/libspectre-test.c
index 0e46852..f5f2e1d 100644
--- a/src/libspectre-test.c
+++ b/src/libspectre-test.c
@@ -6,17 +6,17 @@
 
 int main(int argc, char *argv[])
 {
-	SpectreDocument *document;
-	SpectreRenderContext *rc;
+    SpectreDocument *document;
+    SpectreRenderContext *rc;
 
-	(void)argc;
-	(void)argv;
+    (void)argc;
+    (void)argv;
 
-	document = spectre_document_new();
-	rc = spectre_render_context_new();
+    document = spectre_document_new();
+    rc = spectre_render_context_new();
 
-	spectre_document_free(document);
-	spectre_render_context_free(rc);
+    spectre_document_free(document);
+    spectre_render_context_free(rc);
 
-	return 0;
+    return 0;
 }
diff --git a/src/neon.mk b/src/neon.mk
index 7446d6b..54db5f7 100644
--- a/src/neon.mk
+++ b/src/neon.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967f
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://webdav.org/$(PKG)/$(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := gcc openssl expat gettext
+$(PKG)_DEPS     := gcc expat gettext openssl
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://webdav.org/$(PKG)/' | \
diff --git a/src/ossim.mk b/src/ossim.mk
index 199bf8e..bae27a7 100644
--- a/src/ossim.mk
+++ b/src/ossim.mk
@@ -8,7 +8,7 @@ $(PKG)_VERSION  := 43a071a
 $(PKG)_CHECKSUM := 1796994c8586e62ef799724969e3bef57178194fafe056db3de41dd6ee0dc931
 # releases have unpredictable names and are based on master branch
 $(PKG)_GH_CONF  := ossimlabs/ossim/master
-$(PKG)_DEPS     := gcc freetype geos jpeg hdf5 libgeotiff libpng openthreads proj tiff zlib
+$(PKG)_DEPS     := gcc freetype geos hdf5 jpeg libgeotiff libpng openthreads proj tiff zlib
 
 define $(PKG)_BUILD
     cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
diff --git a/src/qtsparkle-test.cpp b/src/qtsparkle-test.cpp
index 0594294..62054b1 100644
--- a/src/qtsparkle-test.cpp
+++ b/src/qtsparkle-test.cpp
@@ -8,10 +8,10 @@
 
 int main()
 {
-	QWidget w;
-	qtsparkle::Updater* updater = new qtsparkle::Updater(
-		QUrl("http://www.example.com/sparkle.xml"), &w);
-	updater->SetVersion("1.0");
+    QWidget w;
+    qtsparkle::Updater* updater = new qtsparkle::Updater(
+        QUrl("http://www.example.com/sparkle.xml"), &w);
+    updater->SetVersion("1.0");
 
-	return 0;
+    return 0;
 }
diff --git a/src/qtsparkle_qt4-test.cpp b/src/qtsparkle_qt4-test.cpp
index 3e6e657..888311f 100644
--- a/src/qtsparkle_qt4-test.cpp
+++ b/src/qtsparkle_qt4-test.cpp
@@ -8,10 +8,10 @@
 
 int main()
 {
-	QWidget w;
-	qtsparkle::Updater* updater = new qtsparkle::Updater(
-		QUrl("http://www.example.com/sparkle.xml"), &w);
-	updater->SetVersion("1.0");
+    QWidget w;
+    qtsparkle::Updater* updater = new qtsparkle::Updater(
+        QUrl("http://www.example.com/sparkle.xml"), &w);
+    updater->SetVersion("1.0");
 
-	return 0;
+    return 0;
 }
diff --git a/src/spatialite.mk b/src/spatialite.mk
index 185dd75..93f8895 100644
--- a/src/spatialite.mk
+++ b/src/spatialite.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 80f7fff0a147044c5eb197e565f598ac1f137d86d0a548cbc8f52fb7ff7ca
 $(PKG)_SUBDIR   := libspatialite-$($(PKG)_VERSION)
 $(PKG)_FILE     := libspatialite-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.gaia-gis.it/gaia-sins/libspatialite-sources/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc dlfcn-win32 freexl geos sqlite zlib proj libiconv libxml2
+$(PKG)_DEPS     := gcc dlfcn-win32 freexl geos libiconv libxml2 proj sqlite zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.gaia-gis.it/gaia-sins/libspatialite-sources/' | \
diff --git a/src/vtk.mk b/src/vtk.mk
index 47d5419..dfe61b0 100644
--- a/src/vtk.mk
+++ b/src/vtk.mk
@@ -8,7 +8,7 @@ $(PKG)_SUBDIR     := VTK-$($(PKG)_VERSION)
 $(PKG)_FILE       := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL        := https://www.vtk.org/files/release/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_QT_VERSION := 5
-$(PKG)_DEPS       := gcc hdf5 qtbase qttools libpng expat libxml2 jsoncpp tiff freetype lz4 hdf5 libharu glew
+$(PKG)_DEPS       := gcc expat freetype glew hdf5 jsoncpp libharu libpng libxml2 lz4 qtbase qttools tiff
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://vtk.org/gitweb?p=VTK.git;a=tags' | \