Revision: 73089
http://sourceforge.net/p/brlcad/code/73089
Author: brlcad
Date: 2019-05-20 02:08:41 +0000 (Mon, 20 May 2019)
Log Message:
-----------
ws indent cleanup the whole dir. autoformatter wigs out without a footer, so
skip 'other' codes
Modified Paths:
--------------
brlcad/trunk/src/libbu/b64.c
brlcad/trunk/src/libbu/backtrace.c
brlcad/trunk/src/libbu/cmdhist.c
brlcad/trunk/src/libbu/color.c
brlcad/trunk/src/libbu/convert.c
brlcad/trunk/src/libbu/dir.c
brlcad/trunk/src/libbu/escape.c
brlcad/trunk/src/libbu/fchmod.c
brlcad/trunk/src/libbu/file.c
brlcad/trunk/src/libbu/fnmatch.c
brlcad/trunk/src/libbu/hook.c
brlcad/trunk/src/libbu/htond.c
brlcad/trunk/src/libbu/malloc.c
brlcad/trunk/src/libbu/mappedfile.c
brlcad/trunk/src/libbu/observer.c
brlcad/trunk/src/libbu/parallel.c
brlcad/trunk/src/libbu/parse.c
brlcad/trunk/src/libbu/path.c
brlcad/trunk/src/libbu/path_normalize.c
brlcad/trunk/src/libbu/process.c
brlcad/trunk/src/libbu/redblack.c
brlcad/trunk/src/libbu/sort.c
brlcad/trunk/src/libbu/tc.c
brlcad/trunk/src/libbu/tcllist.c
brlcad/trunk/src/libbu/temp.c
brlcad/trunk/src/libbu/tests/badmagic.c
brlcad/trunk/src/libbu/tests/basename.c
brlcad/trunk/src/libbu/tests/dirname.c
brlcad/trunk/src/libbu/tests/encode.c
brlcad/trunk/src/libbu/tests/file.c
brlcad/trunk/src/libbu/tests/hash.cpp
brlcad/trunk/src/libbu/tests/humanize_number.c
brlcad/trunk/src/libbu/tests/mappedfile.c
brlcad/trunk/src/libbu/tests/opt.c
brlcad/trunk/src/libbu/tests/semchk.cxx
brlcad/trunk/src/libbu/tests/sscanf.c
brlcad/trunk/src/libbu/tests/str_isprint.c
brlcad/trunk/src/libbu/tests/vls_vprintf.c
brlcad/trunk/src/libbu/thread.cpp
brlcad/trunk/src/libbu/units_humanize.c
brlcad/trunk/src/libbu/vls.c
brlcad/trunk/src/libbu/vls_vprintf.c
Modified: brlcad/trunk/src/libbu/b64.c
===================================================================
--- brlcad/trunk/src/libbu/b64.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/b64.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -1,10 +1,10 @@
/*
- b64.c - c source to a base64 encoding algorithm implementation
+ b64.c - c source to a base64 encoding algorithm implementation
- This is a reworked version of the C encoder/decoder from the libb64
- project, and has been placed in the public domain.
- For details, see http://sourceforge.net/projects/libb64
- */
+ This is a reworked version of the C encoder/decoder from the libb64
+ project, and has been placed in the public domain.
+ For details, see http://sourceforge.net/projects/libb64
+*/
#include "common.h"
@@ -16,23 +16,23 @@
#include "bu/malloc.h"
typedef enum {
- step_A, step_B, step_C
+ step_A, step_B, step_C
} bu_b64_encodestep;
typedef enum {
- step_a, step_b, step_c, step_d
+ step_a, step_b, step_c, step_d
} bu_b64_decodestep;
typedef struct {
- bu_b64_encodestep step;
- signed char result;
- int stepcount;
+ bu_b64_encodestep step;
+ signed char result;
+ int stepcount;
} bu_b64_encodestate;
typedef struct {
- bu_b64_decodestep step;
- signed char plainchar;
+ bu_b64_decodestep step;
+ signed char plainchar;
} bu_b64_decodestate;
const int CHARS_PER_LINE = 72;
Modified: brlcad/trunk/src/libbu/backtrace.c
===================================================================
--- brlcad/trunk/src/libbu/backtrace.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/backtrace.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -192,8 +192,8 @@
if (have_gdb) {
/* if (write(input[1], "set prompt\n", 12) != 12) {
- perror("write [set prompt] failed");
- } else */if (write(input[1], "set confirm off\n", 16) != 16) {
+ perror("write [set prompt] failed");
+ } else */if (write(input[1], "set confirm off\n", 16) != 16) {
perror("write [set confirm off] failed");
} else if (write(input[1], "set backtrace past-main on\n", 27) !=
27) {
perror("write [set backtrace past-main on] failed");
@@ -501,7 +501,7 @@
bu_log("[BACKTRACE] bu_backtrace() waiting 1 second (of %d)\n",
cnt);
}
bu_snooze(BU_SEC2USEC(1));
- cnt++;
+ cnt++;
}
#ifdef HAVE_KILL
if (UNLIKELY(bu_debug & BU_DEBUG_BACKTRACE)) {
Modified: brlcad/trunk/src/libbu/cmdhist.c
===================================================================
--- brlcad/trunk/src/libbu/cmdhist.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/cmdhist.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -44,14 +44,14 @@
if (chop->cmdhist.capacity == 0) {
chop->cmdhist.capacity = BU_CMDHIST_OBJ_LIST_INIT_CAPACITY;
chop->cmdhist.cmdhist = (struct bu_cmdhist *)bu_malloc(
- sizeof (struct bu_cmdhist) * chop->cmdhist.capacity,
- "init chop");
+ sizeof (struct bu_cmdhist) * chop->cmdhist.capacity,
+ "init chop");
} else if (chop->cmdhist.size == chop->cmdhist.capacity) {
chop->cmdhist.capacity *= 2;
chop->cmdhist.cmdhist = (struct bu_cmdhist *)bu_realloc(
- chop->cmdhist.cmdhist,
- sizeof (struct bu_cmdhist_obj) * chop->cmdhist.capacity,
- "init chop");
+ chop->cmdhist.cmdhist,
+ sizeof (struct bu_cmdhist_obj) * chop->cmdhist.capacity,
+ "init chop");
}
new_hist = &chop->cmdhist.cmdhist[chop->cmdhist.size];
@@ -218,7 +218,7 @@
}
if (chop->cmdhist.capacity > 0) {
- /* result is at index chop->cmdhist.current */
+ /* result is at index chop->cmdhist.current */
return BRLCAD_OK;
}
@@ -237,12 +237,12 @@
return BRLCAD_ERROR;
}
- if (chop->cmdhist.capacity == 0 ||
- chop->cmdhist.current == chop->cmdhist.size - 1) {
+ if (chop->cmdhist.capacity == 0 ||
+ chop->cmdhist.current == chop->cmdhist.size - 1) {
return BRLCAD_ERROR;
- }
+ }
- chop->cmdhist.current++;
+ chop->cmdhist.current++;
/* result is at index chop->cmdhist.current */
return BRLCAD_OK;
Modified: brlcad/trunk/src/libbu/color.c
===================================================================
--- brlcad/trunk/src/libbu/color.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/color.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -308,7 +308,7 @@
errno = 0;
- /* 0 = RGB, 1 = FLOAT, 2 = UNKNOWN */
+ /* 0 = RGB, 1 = FLOAT, 2 = UNKNOWN */
switch (mode) {
case 0: /*RGB*/
newcolor.buc_rgb[i] = strtol(str, (char **)&endptr, 10) / 255.0;
Modified: brlcad/trunk/src/libbu/convert.c
===================================================================
--- brlcad/trunk/src/libbu/convert.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/convert.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -287,8 +287,8 @@
{
register int fmt = (cookie & CV_TYPE_MASK) >> CV_TYPE_SHIFT;
static size_t host_size_table[8] = {0, sizeof(char),
- sizeof(short), sizeof(int),
- sizeof(long int), sizeof(double)};
+ sizeof(short), sizeof(int),
+ sizeof(long int), sizeof(double)};
static size_t net_size_table[8] = {0, 1, 2, 4, 8, 8};
if (cookie & CV_HOST_MASK)
Modified: brlcad/trunk/src/libbu/dir.c
===================================================================
--- brlcad/trunk/src/libbu/dir.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/dir.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -174,8 +174,8 @@
if (BU_STR_EMPTY(path)) {
PWSTR wpath;
if (SHGetKnownFolderPath(&FOLDERID_Profile, 0, NULL, &wpath) == S_OK) {
- wcstombs(path, wpath, MAXPATHLEN);
- CoTaskMemFree(wpath);
+ wcstombs(path, wpath, MAXPATHLEN);
+ CoTaskMemFree(wpath);
}
}
#endif
@@ -231,7 +231,7 @@
if (BU_STR_EMPTY(path)) {
PWSTR wpath;
if (SHGetKnownFolderPath(&FOLDERID_RoamingAppData, 0, NULL, &wpath) ==
S_OK) {
- wcstombs(path, wpath, MAXPATHLEN);
+ wcstombs(path, wpath, MAXPATHLEN);
CoTaskMemFree(wpath);
}
}
Modified: brlcad/trunk/src/libbu/escape.c
===================================================================
--- brlcad/trunk/src/libbu/escape.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/escape.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -32,7 +32,7 @@
expand_expression(const char *expression, struct bu_vls *vp)
{
const char *ep = expression;
- const char *cp;
+ const char *cp;
if (!expression)
return 0;
Modified: brlcad/trunk/src/libbu/fchmod.c
===================================================================
--- brlcad/trunk/src/libbu/fchmod.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/fchmod.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -157,10 +157,10 @@
HANDLE h = (HANDLE)_get_osfhandle(fd);
GetFileNameFromHandle(h, filepath);
- /* quell flawfinder because this is a necessary evil unless/until
- * someone rewrites this to use SetNamedSecurityInfo() based on
- * unix-style permissions/mode settings.
- */
+ /* quell flawfinder because this is a necessary evil unless/until
+ * someone rewrites this to use SetNamedSecurityInfo() based on
+ * unix-style permissions/mode settings.
+ */
# define CHMOD ch ## mod
return CHMOD(filepath, pmode);
Modified: brlcad/trunk/src/libbu/file.c
===================================================================
--- brlcad/trunk/src/libbu/file.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/file.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -163,10 +163,11 @@
}
/* On Windows, test if paths map to the same space on disk. */
- if (got1 && got2 &&
- (file_info1.dwVolumeSerialNumber ==
file_info2.dwVolumeSerialNumber) &&
- (file_info1.nFileIndexLow == file_info2.nFileIndexLow) &&
- (file_info1.nFileIndexHigh = file_info2.nFileIndexHigh)) {
+ if (got1 && got2
+ && (file_info1.dwVolumeSerialNumber == file_info2.dwVolumeSerialNumber)
+ && (file_info1.nFileIndexLow == file_info2.nFileIndexLow)
+ && (file_info1.nFileIndexHigh = file_info2.nFileIndexHigh))
+ {
return 1;
}
@@ -230,7 +231,7 @@
*/
struct stat sb1, sb2;
if ((stat(rp1, &sb1) == 0) && (stat(rp2, &sb2) == 0) &&
- (sb1.st_dev == sb2.st_dev) && (sb1.st_ino == sb2.st_ino)) {
+ (sb1.st_dev == sb2.st_dev) && (sb1.st_ino == sb2.st_ino)) {
ret = 1;
}
#endif
@@ -391,9 +392,9 @@
/* reject empty, special, or non-existent paths */
if (!path
- || BU_STR_EQUAL(path, "")
- || BU_STR_EQUAL(path, ".")
- || BU_STR_EQUAL(path, "..") )
+ || BU_STR_EQUAL(path, "")
+ || BU_STR_EQUAL(path, ".")
+ || BU_STR_EQUAL(path, "..") )
{
return 0;
}
Modified: brlcad/trunk/src/libbu/fnmatch.c
===================================================================
--- brlcad/trunk/src/libbu/fnmatch.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/fnmatch.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -102,9 +102,9 @@
resultholder = (size_t)-1;
} else {
/*
- c = *pattern;
- bu_log("classname: %s, test char = %c, (class->checkfun)=%d\n",
bu_vls_addr(&classname), test, (ctclass->checkfun)(test));
- */
+ c = *pattern;
+ bu_log("classname: %s, test char = %c, (class->checkfun)=%d\n",
bu_vls_addr(&classname), test, (ctclass->checkfun)(test));
+ */
if ((ctclass->checkfun)(test) != 0) {
resultholder = counter;
} else {
Modified: brlcad/trunk/src/libbu/hook.c
===================================================================
--- brlcad/trunk/src/libbu/hook.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/hook.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -60,9 +60,9 @@
if (hlp->size == hlp->capacity) {
hlp->capacity = (hlp->capacity > 0) ? hlp->capacity * 2 : 1;
hlp->hooks = (struct bu_hook *)bu_realloc(
- hlp->hooks,
- sizeof (struct bu_hook) * hlp->capacity,
- "resize hooks");
+ hlp->hooks,
+ sizeof (struct bu_hook) * hlp->capacity,
+ "resize hooks");
}
hlp->hooks[hlp->size].hookfunc = func;
@@ -78,7 +78,7 @@
size_t i;
for (i = 0; i < hlp->size; i++) {
- crt = &hlp->hooks[i];
+ crt = &hlp->hooks[i];
if (crt->hookfunc == func && crt->clientdata == clientdata) {
memmove(crt, crt + 1, sizeof (struct bu_hook) * (hlp->size - i));
hlp->size--;
@@ -94,7 +94,7 @@
size_t i;
for (i = 0; i < hlp->size; i++) {
- call_hook = &hlp->hooks[i];
+ call_hook = &hlp->hooks[i];
if (UNLIKELY(!(call_hook->hookfunc))) {
exit(EXIT_FAILURE); /* don't call through 0! */
}
Modified: brlcad/trunk/src/libbu/htond.c
===================================================================
--- brlcad/trunk/src/libbu/htond.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/htond.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -41,7 +41,7 @@
*out++ = 0; \
*out++ = 0; \
continue; \
-}
+ }
#define OUT_IEEE_NAN { /* Signaling NAN */ \
@@ -54,7 +54,7 @@
*out++ = 0x0B; \
*out++ = 0xAD; \
continue; \
-}
+ }
void
Modified: brlcad/trunk/src/libbu/malloc.c
===================================================================
--- brlcad/trunk/src/libbu/malloc.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/malloc.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -347,7 +347,7 @@
#ifdef HAVE_SYS_SHM_H
bu_shmget(int *shmid, char **shared_memory, int key, size_t size)
#else
-bu_shmget(int *UNUSED(shmid), char **UNUSED(shared_memory), int UNUSED(key),
size_t UNUSED(size))
+ bu_shmget(int *UNUSED(shmid), char **UNUSED(shared_memory), int
UNUSED(key), size_t UNUSED(size))
#endif
{
int ret = 1;
@@ -366,9 +366,9 @@
errno = 0;
/*
- make more portable
- shmsize = (size + getpagesize()-1) & ~(getpagesize()-1);
- */
+ make more portable
+ shmsize = (size + getpagesize()-1) & ~(getpagesize()-1);
+ */
shmsize = (size + psize - 1) & ~(psize - 1);
/* First try to attach to an existing one */
if (((*shmid) = shmget(key, shmsize, 0)) < 0) {
Modified: brlcad/trunk/src/libbu/mappedfile.c
===================================================================
--- brlcad/trunk/src/libbu/mappedfile.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/mappedfile.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -446,7 +446,7 @@
munmap(mp->buf, (size_t)mp->buflen);
#else
# ifdef HAVE_WINDOWS_H
- win_munmap(mp->buf, (size_t)mp->buflen, mp->handle);
+ win_munmap(mp->buf, (size_t)mp->buflen, mp->handle);
# endif
#endif
else
Modified: brlcad/trunk/src/libbu/observer.c
===================================================================
--- brlcad/trunk/src/libbu/observer.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/observer.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -73,7 +73,7 @@
return BRLCAD_OK;
}
- }
+ }
/* acquire bu_observer struct */
bu_observer_list_init(observers);
@@ -123,7 +123,7 @@
return BRLCAD_OK;
}
- }
+ }
bu_log("detach: %s not found", argv[1]);
return BRLCAD_ERROR;
Modified: brlcad/trunk/src/libbu/parallel.c
===================================================================
--- brlcad/trunk/src/libbu/parallel.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/parallel.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -396,7 +396,7 @@
threads = parent->started - parent->finished;
/*bu_log("threads=%d (start %d - done %d)\n", threads, parent->started,
parent->finished);
- bu_log("max_threads=%d, throttle: %d\n", max_threads, throttle);*/
+ bu_log("max_threads=%d, throttle: %d\n", max_threads, throttle);*/
if (threads < max_threads || !throttle) {
return;
Modified: brlcad/trunk/src/libbu/parse.c
===================================================================
--- brlcad/trunk/src/libbu/parse.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/parse.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -53,7 +53,7 @@
} while (offset < 0); \
offset = cp - (char *)ext->ext_buf; \
ext->ext_buf = (uint8_t *)bu_realloc((char *) ext->ext_buf, \
- ext->ext_nbytes,
"bu_struct_export"); \
+ ext->ext_nbytes,
"bu_struct_export"); \
ep = (char *)ext->ext_buf + ext->ext_nbytes; \
cp = (char *)ext->ext_buf + offset; \
} \
@@ -1031,8 +1031,8 @@
HIDDEN void
parse_vls_matprint(struct bu_vls *vls,
- const char *name,
- register const fastf_t *mat)
+ const char *name,
+ register const fastf_t *mat)
{
int delta;
@@ -1065,8 +1065,8 @@
HIDDEN void
parse_vls_dmatprint(struct bu_vls *vls,
- const char *name,
- register const double *mat)
+ const char *name,
+ register const double *mat)
{
int delta;
Modified: brlcad/trunk/src/libbu/path.c
===================================================================
--- brlcad/trunk/src/libbu/path.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/path.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -43,18 +43,18 @@
/* Special cases */
if (UNLIKELY(!cp))
- return bu_strdup(".");
+ return bu_strdup(".");
if (BU_STR_EQUAL(cp, DSLASH))
- return bu_strdup(DSLASH);
+ return bu_strdup(DSLASH);
if (BU_STR_EQUAL(cp, FSLASH))
- return bu_strdup(FSLASH);
+ return bu_strdup(FSLASH);
if (BU_STR_EQUAL(cp, DOT)
- || BU_STR_EQUAL(cp, DOTDOT)
- || (strrchr(cp, BU_DIR_SEPARATOR) == NULL
- && strrchr(cp, '/') == NULL))
- return bu_strdup(DOT);
+ || BU_STR_EQUAL(cp, DOTDOT)
+ || (strrchr(cp, BU_DIR_SEPARATOR) == NULL
+ && strrchr(cp, '/') == NULL))
+ return bu_strdup(DOT);
/* Make a duplicate copy of the string, and shorten it in place */
ret = bu_strdup(cp);
@@ -62,10 +62,10 @@
/* A sequence of trailing slashes don't count */
len = strlen(ret);
while (len > 1
- && (ret[len-1] == BU_DIR_SEPARATOR
- || ret[len-1] == '/')) {
- ret[len-1] = '\0';
- len--;
+ && (ret[len-1] == BU_DIR_SEPARATOR
+ || ret[len-1] == '/')) {
+ ret[len-1] = '\0';
+ len--;
}
/* If no slashes remain, return "." */
@@ -72,18 +72,18 @@
found_dslash = strrchr(ret, BU_DIR_SEPARATOR);
found_fslash = strrchr(ret, '/');
if (!found_dslash && !found_fslash) {
- bu_free(ret, "bu_path_dirname");
- return bu_strdup(DOT);
+ bu_free(ret, "bu_path_dirname");
+ return bu_strdup(DOT);
}
/* Remove trailing slash, unless it's at front */
if (found_dslash == ret || found_fslash == ret) {
- ret[1] = '\0'; /* ret == BU_DIR_SEPARATOR || "/" */
+ ret[1] = '\0'; /* ret == BU_DIR_SEPARATOR || "/" */
} else {
- if (found_dslash)
- *found_dslash = '\0';
- if (found_fslash)
- *found_fslash = '\0';
+ if (found_dslash)
+ *found_dslash = '\0';
+ if (found_fslash)
+ *found_fslash = '\0';
}
return ret;
@@ -102,7 +102,7 @@
bu_strlcpy(basename, ".", strlen(".")+1);
return basename;
}
- return bu_strdup(".");
+ return bu_strdup(".");
}
/* skip the filesystem disk/drive name if we're on a DOS-capable
@@ -109,18 +109,18 @@
* platform that uses '\' for paths, e.g., C:\ -> \
*/
if (BU_DIR_SEPARATOR == '\\' && isalpha((int)(path[0])) && path[1] == ':')
{
- path += 2;
+ path += 2;
}
/* Skip leading separators, e.g., ///foo/bar -> foo/bar */
for (p = path; *p != '\0'; p++) {
- /* check native separator as well as / so we can use this
- * routine for geometry paths too.
- */
- if ((p[0] == BU_DIR_SEPARATOR && p[1] != BU_DIR_SEPARATOR && p[1] !=
'\0')
- || (p[0] == '/' && p[1] != '/' && p[1] != '\0')) {
- path = p+1;
- }
+ /* check native separator as well as / so we can use this
+ * routine for geometry paths too.
+ */
+ if ((p[0] == BU_DIR_SEPARATOR && p[1] != BU_DIR_SEPARATOR && p[1] !=
'\0')
+ || (p[0] == '/' && p[1] != '/' && p[1] != '\0')) {
+ path = p+1;
+ }
}
len = strlen(path);
@@ -127,7 +127,7 @@
/* Remove trailing separators */
while (len > 1 && (path[len - 1] == BU_DIR_SEPARATOR || path[len - 1] ==
'/'))
- len--;
+ len--;
if (basename) {
if (len > 0) {
@@ -196,11 +196,11 @@
if (strlen(basename) > 0) {
ret = 1;
if (component) {
- period_pos = strrchr(basename, '.');
- bu_vls_sprintf(component, "%s", basename);
+ period_pos = strrchr(basename, '.');
+ bu_vls_sprintf(component, "%s", basename);
if (period_pos) {
- bu_vls_trunc(component, -1 * (int)strlen(period_pos));
- }
+ bu_vls_trunc(component, -1 * (int)strlen(period_pos));
+ }
}
}
break;
@@ -242,7 +242,7 @@
register int i;
if (UNLIKELY(path == (char *)0 || path[0] == '\0'))
- return (char **)0;
+ return (char **)0;
newstr = bu_strdup(path);
@@ -249,11 +249,11 @@
/* skip leading /'s */
i = 0;
while (newstr[i] == '/')
- ++i;
+ ++i;
if (UNLIKELY(newstr[i] == '\0')) {
- bu_free((void *)newstr, "bu_path_to_argv");
- return (char **)0;
+ bu_free((void *)newstr, "bu_path_to_argv");
+ return (char **)0;
}
/* If we get here, there is at least one path element */
@@ -263,10 +263,10 @@
/* First count the number of '/' */
begin = headpath;
while ((end = strchr(begin, '/')) != (char *)0) {
- if (begin != end)
- ++*ac;
+ if (begin != end)
+ ++*ac;
- begin = end + 1;
+ begin = end + 1;
}
av = (char **)bu_calloc((unsigned int)(*ac)+1, sizeof(char *),
"bu_path_to_argv");
@@ -273,20 +273,20 @@
begin = headpath;
i = 0;
while ((end = strchr(begin, '/')) != (char *)0) {
- if (begin != end) {
- *end = '\0';
- av[i++] = bu_strdup(begin);
- }
+ if (begin != end) {
+ *end = '\0';
+ av[i++] = bu_strdup(begin);
+ }
- begin = end + 1;
+ begin = end + 1;
}
if (begin[0] != '\0') {
- av[i++] = bu_strdup(begin);
- av[i] = (char *)0;
+ av[i++] = bu_strdup(begin);
+ av[i] = (char *)0;
} else {
- av[i] = (char *)0;
- --*ac;
+ av[i] = (char *)0;
+ --*ac;
}
bu_free((void *)newstr, "bu_path_to_argv");
Modified: brlcad/trunk/src/libbu/path_normalize.c
===================================================================
--- brlcad/trunk/src/libbu/path_normalize.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/path_normalize.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -60,48 +60,48 @@
loop:
/* Skip any slash. */
while (*path == '/')
- path++;
+ path++;
if (*path == 0) {
- if (p == resolved)
- *p++ = '/';
- *p = 0;
- return (resolved);
+ if (p == resolved)
+ *p++ = '/';
+ *p = 0;
+ return (resolved);
}
/* Find the end of this component. */
q = path;
do
- q++;
+ q++;
while (*q != '/' && *q != 0);
/* Test . or .. */
if (path[0] == '.') {
- if (q - path == 1) {
- path = q;
- goto loop;
- }
- if (path[1] == '.' && q - path == 2) {
- /* Trim the last component. */
- if (p != resolved)
- while (*--p != '/')
- ;
- path = q;
- goto loop;
- }
+ if (q - path == 1) {
+ path = q;
+ goto loop;
+ }
+ if (path[1] == '.' && q - path == 2) {
+ /* Trim the last component. */
+ if (p != resolved)
+ while (*--p != '/')
+ ;
+ path = q;
+ goto loop;
+ }
}
/* Append this component. */
if (p - resolved + 1 + q - path + 1 > MAXPATHLEN) {
- if (p == resolved)
- *p++ = '/';
- *p = 0;
- return (NULL);
+ if (p == resolved)
+ *p++ = '/';
+ *p = 0;
+ return (NULL);
}
p[0] = '/';
memcpy(&p[1], path,
- /* LINTED We know q > path. */
- q - path);
+ /* LINTED We know q > path. */
+ q - path);
p[1 + q - path] = 0;
/* Advance both resolved and unresolved path. */
Modified: brlcad/trunk/src/libbu/process.c
===================================================================
--- brlcad/trunk/src/libbu/process.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/process.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -39,6 +39,7 @@
extern pid_t wait(int *);
#endif
+
int
bu_process_id()
{
@@ -98,6 +99,7 @@
}
}
+
FILE *
bu_process_open(struct bu_process *pinfo, int fd)
{
@@ -150,6 +152,7 @@
return NULL;
}
+
int
bu_process_pid(struct bu_process *pinfo)
{
@@ -157,6 +160,7 @@
return (int)pinfo->pid;
}
+
int
bu_process_args(const char **cmd, const char * const **argv, struct bu_process
*pinfo)
{
@@ -170,6 +174,7 @@
return pinfo->argc;
}
+
int
bu_process_read(char *buff, int *count, struct bu_process *pinfo, int fd, int
n)
{
@@ -218,11 +223,14 @@
void
+bu_process_exec(
+ struct bu_process **p, const char *cmd, int argc, const char **argv, int
out_eql_err,
#ifdef _WIN32
-bu_process_exec(struct bu_process **p, const char *cmd, int argc, const char
**argv, int out_eql_err, int hide_window)
+ int hide_window
#else
-bu_process_exec(struct bu_process **p, const char *cmd, int argc, const char
**argv, int out_eql_err, int UNUSED(hide_window))
+ int UNUSED(hide_window)
#endif
+ )
{
int pret = 0;
int ac = argc;
@@ -372,9 +380,9 @@
/* Create noninheritable read handle and close the inheritable read
handle. */
DuplicateHandle(GetCurrentProcess(), pipe_out[0],
- GetCurrentProcess(), &pipe_outDup ,
- 0, FALSE,
- DUPLICATE_SAME_ACCESS);
+ GetCurrentProcess(), &pipe_outDup ,
+ 0, FALSE,
+ DUPLICATE_SAME_ACCESS);
CloseHandle(pipe_out[0]);
/* Create a pipe for the child process's STDERR. */
@@ -382,9 +390,9 @@
/* Create noninheritable read handle and close the inheritable read
handle. */
DuplicateHandle(GetCurrentProcess(), pipe_err[0],
- GetCurrentProcess(), &pipe_errDup ,
- 0, FALSE,
- DUPLICATE_SAME_ACCESS);
+ GetCurrentProcess(), &pipe_errDup ,
+ 0, FALSE,
+ DUPLICATE_SAME_ACCESS);
CloseHandle(pipe_err[0]);
/* Create a pipe for the child process's STDIN. */
@@ -392,9 +400,9 @@
/* Duplicate the write handle to the pipe so it is not inherited. */
DuplicateHandle(GetCurrentProcess(), pipe_in[1],
- GetCurrentProcess(), &pipe_inDup,
- 0, FALSE, /* not inherited */
- DUPLICATE_SAME_ACCESS);
+ GetCurrentProcess(), &pipe_inDup,
+ 0, FALSE, /* not inherited */
+ DUPLICATE_SAME_ACCESS);
CloseHandle(pipe_in[1]);
si.cb = sizeof(STARTUPINFO);
@@ -427,8 +435,8 @@
}
CreateProcess(NULL, bu_vls_addr(&cp_cmd), NULL, NULL, TRUE,
- DETACHED_PROCESS, NULL, NULL,
- &si, &pi);
+ DETACHED_PROCESS, NULL, NULL,
+ &si, &pi);
bu_vls_free(&cp_cmd);
CloseHandle(pipe_in[0]);
@@ -451,11 +459,14 @@
}
int
+bu_process_wait(
+ int *aborted, struct bu_process *pinfo,
#ifndef _WIN32
-bu_process_wait(int *aborted, struct bu_process *pinfo, int UNUSED(wtime))
+ int UNUSED(wtime)
#else
-bu_process_wait(int *aborted, struct bu_process *pinfo, int wtime)
+ int wtime
#endif
+ )
{
int rc = 0;
#ifndef _WIN32
Modified: brlcad/trunk/src/libbu/redblack.c
===================================================================
--- brlcad/trunk/src/libbu/redblack.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/redblack.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -249,7 +249,7 @@
* Free all the nodes
*/
for (i = 0; i < tree->rbt_nodes.size; i++) {
- node = tree->rbt_nodes.rbl_node[i];
+ node = tree->rbt_nodes.rbl_node[i];
rb_free_node(node);
}
@@ -999,18 +999,18 @@
while (node != RB_NULL(tree)) {
parent = node;
++RB_SIZE(parent, order);
- if (UNLIKELY(tree->rbt_debug & BU_RB_DEBUG_OS))
+ if (UNLIKELY(tree->rbt_debug & BU_RB_DEBUG_OS))
bu_log("_rb_insert(%p): size(%p, %d)=%d\n",
(void*)new_node, (void*)parent, order, RB_SIZE(parent,
order));
comparison = compare(RB_DATA(new_node, order),
RB_DATA(node, order));
if (comparison < 0) {
- if (UNLIKELY(tree->rbt_debug & BU_RB_DEBUG_INSERT))
+ if (UNLIKELY(tree->rbt_debug & BU_RB_DEBUG_INSERT))
bu_log("_rb_insert(%p): <_%d <%p>, going left\n",
(void*)new_node, order, (void*)node);
node = RB_LEFT_CHILD(node, order);
} else {
- if (UNLIKELY(tree->rbt_debug & BU_RB_DEBUG_INSERT))
+ if (UNLIKELY(tree->rbt_debug & BU_RB_DEBUG_INSERT))
bu_log("_rb_insert(%p): >=_%d <%p>, going right\n",
(void*)new_node, order, (void*)node);
node = RB_RIGHT_CHILD(node, order);
@@ -1107,18 +1107,18 @@
/*
* Make a new package and add it to the list of all packages.
*/
- if (tree->rbt_packages.capacity == 0) {
- tree->rbt_packages.capacity = BU_RB_LIST_INIT_CAPACITY;
- tree->rbt_packages.rbl_package = (struct bu_rb_package **)bu_malloc(
- sizeof tree->rbt_packages.rbl_package[0] *
tree->rbt_packages.capacity,
- "initial rb list init");
- } else if (tree->rbt_packages.size == tree->rbt_packages.capacity) {
- tree->rbt_packages.capacity *= 2;
- tree->rbt_packages.rbl_package = (struct bu_rb_package
**)bu_realloc(
- tree->rbt_packages.rbl_package,
- sizeof tree->rbt_packages.rbl_package[0] *
tree->rbt_packages.capacity,
- "initial rb list init");
- }
+ if (tree->rbt_packages.capacity == 0) {
+ tree->rbt_packages.capacity = BU_RB_LIST_INIT_CAPACITY;
+ tree->rbt_packages.rbl_package = (struct bu_rb_package **)bu_malloc(
+ sizeof tree->rbt_packages.rbl_package[0] *
tree->rbt_packages.capacity,
+ "initial rb list init");
+ } else if (tree->rbt_packages.size == tree->rbt_packages.capacity) {
+ tree->rbt_packages.capacity *= 2;
+ tree->rbt_packages.rbl_package = (struct bu_rb_package **)bu_realloc(
+ tree->rbt_packages.rbl_package,
+ sizeof tree->rbt_packages.rbl_package[0] *
tree->rbt_packages.capacity,
+ "initial rb list init");
+ }
BU_ALLOC(package, struct bu_rb_package);
package->rbp_node = (struct bu_rb_node **)
@@ -1132,18 +1132,18 @@
/*
* Make a new node and add it to the list of all nodes.
*/
- if (tree->rbt_nodes.capacity == 0) {
- tree->rbt_nodes.capacity = BU_RB_LIST_INIT_CAPACITY;
- tree->rbt_nodes.rbl_node = (struct bu_rb_node **)bu_malloc(
- sizeof tree->rbt_nodes.rbl_node[0] *
tree->rbt_nodes.capacity,
- "initial rb list init");
- } else if (tree->rbt_nodes.size == tree->rbt_nodes.capacity) {
- tree->rbt_nodes.capacity *= 2;
- tree->rbt_nodes.rbl_node = (struct bu_rb_node **)bu_realloc(
- tree->rbt_nodes.rbl_node,
- sizeof tree->rbt_nodes.rbl_node[0] *
tree->rbt_nodes.capacity,
- "initial rb list init");
- }
+ if (tree->rbt_nodes.capacity == 0) {
+ tree->rbt_nodes.capacity = BU_RB_LIST_INIT_CAPACITY;
+ tree->rbt_nodes.rbl_node = (struct bu_rb_node **)bu_malloc(
+ sizeof tree->rbt_nodes.rbl_node[0] * tree->rbt_nodes.capacity,
+ "initial rb list init");
+ } else if (tree->rbt_nodes.size == tree->rbt_nodes.capacity) {
+ tree->rbt_nodes.capacity *= 2;
+ tree->rbt_nodes.rbl_node = (struct bu_rb_node **)bu_realloc(
+ tree->rbt_nodes.rbl_node,
+ sizeof tree->rbt_nodes.rbl_node[0] * tree->rbt_nodes.capacity,
+ "initial rb list init");
+ }
node = (struct bu_rb_node *)
bu_malloc(sizeof(struct bu_rb_node), "red-black node");
Modified: brlcad/trunk/src/libbu/sort.c
===================================================================
--- brlcad/trunk/src/libbu/sort.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/sort.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -40,7 +40,7 @@
* Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
*/
#define SWAPCODE(TYPE, parmi, parmj, n) \
- { \
+ do { \
size_t i = (n) / sizeof (TYPE); \
TYPE *pi = (TYPE *) (parmi); \
TYPE *pj = (TYPE *) (parmj); \
@@ -49,10 +49,10 @@
*pi++ = *pj; \
*pj++ = t; \
} while (--i > 0); \
- }
+ } while (0)
#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
- es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
+ es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
static void
@@ -59,19 +59,21 @@
swapfunc(char *a, char *b, size_t n, int swaptype)
{
if (swaptype <= 1)
- SWAPCODE(long, a, b, n)
+ SWAPCODE(long, a, b, n);
else
- SWAPCODE(char, a, b, n)
+ SWAPCODE(char, a, b, n);
}
-#define SWAP(a, b) \
- if (swaptype == 0) { \
- long t = *(long *)(a); \
- *(long *)(a) = *(long *)(b); \
- *(long *)(b) = t; \
- } else \
- swapfunc((char *)a, (char *)b, sizememb, swaptype)
+#define SWAP(a, b) do { \
+ if (swaptype == 0) { \
+ long t = *(long *)(a); \
+ *(long *)(a) = *(long *)(b); \
+ *(long *)(b) = t; \
+ } else { \
+ swapfunc((char *)a, (char *)b, sizememb, swaptype); \
+ } \
+ } while (0)
#define VECSWAP(a, b, n) if ((n) > 0) swapfunc((char *)a, (char *)b, n,
swaptype)
@@ -82,8 +84,8 @@
med3(char *a, char *b, char *c, int (*compare)(const void *, const void *,
void *), void *thunk)
{
return CMP(a, b, thunk) < 0 ?
- (CMP(b, c, thunk) < 0 ? b : (CMP(a, c, thunk) < 0 ? c : a))
- :(CMP(b, c, thunk) > 0 ? b : (CMP(a, c, thunk) < 0 ? a : c));
+ (CMP(b, c, thunk) < 0 ? b : (CMP(a, c, thunk) < 0 ? c : a))
+ :(CMP(b, c, thunk) > 0 ? b : (CMP(a, c, thunk) < 0 ? a : c));
}
@@ -96,7 +98,7 @@
size_t d, r;
size_t swap_cnt;
- loop: SWAPINIT(array, sizememb);
+loop: SWAPINIT(array, sizememb);
swap_cnt = 0;
if (nummemb < 7) {
for (pm = (char *)array + sizememb; pm < (char *)array + nummemb *
sizememb; pm += sizememb)
Modified: brlcad/trunk/src/libbu/tc.c
===================================================================
--- brlcad/trunk/src/libbu/tc.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/tc.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -28,13 +28,15 @@
#include <stdlib.h>
#include "bu/tc.h"
-int bu_mtx_init(bu_mtx_t *mtx)
+
+int
+bu_mtx_init(bu_mtx_t *mtx)
{
#if defined(HAVE_WINDOWS_H)
mtx->mAlreadyLocked = FALSE;
mtx->mRecursive = 0;
mtx->mTimed = 0;
- InitializeCriticalSection(&(mtx->mHandle.cs));
+ InitializeCriticalSection(&(mtx->mHandle.cs));
return bu_thrd_success;
#else
int ret;
@@ -46,179 +48,190 @@
#endif
}
-void bu_mtx_destroy(bu_mtx_t *mtx)
+
+void
+bu_mtx_destroy(bu_mtx_t *mtx)
{
#if defined(HAVE_WINDOWS_H)
- if (!mtx->mTimed)
- {
- DeleteCriticalSection(&(mtx->mHandle.cs));
- }
- else
- {
- CloseHandle(mtx->mHandle.mut);
- }
+ if (!mtx->mTimed) {
+ DeleteCriticalSection(&(mtx->mHandle.cs));
+ } else {
+ CloseHandle(mtx->mHandle.mut);
+ }
#else
- pthread_mutex_destroy(mtx);
+ pthread_mutex_destroy(mtx);
#endif
}
+
#if defined(HAVE_WINDOWS_H)
#define _CONDITION_EVENT_ONE 0
#define _CONDITION_EVENT_ALL 1
#endif
-int bu_cnd_init(bu_cnd_t *cond)
+
+int
+bu_cnd_init(bu_cnd_t *cond)
{
#if defined(HAVE_WINDOWS_H)
- cond->mWaitersCount = 0;
+ cond->mWaitersCount = 0;
- /* Init critical section */
- InitializeCriticalSection(&cond->mWaitersCountLock);
+ /* Init critical section */
+ InitializeCriticalSection(&cond->mWaitersCountLock);
- /* Init events */
- cond->mEvents[_CONDITION_EVENT_ONE] = CreateEvent(NULL, FALSE, FALSE, NULL);
- if (cond->mEvents[_CONDITION_EVENT_ONE] == NULL)
- {
- cond->mEvents[_CONDITION_EVENT_ALL] = NULL;
- return bu_thrd_error;
- }
- cond->mEvents[_CONDITION_EVENT_ALL] = CreateEvent(NULL, TRUE, FALSE, NULL);
- if (cond->mEvents[_CONDITION_EVENT_ALL] == NULL)
- {
- CloseHandle(cond->mEvents[_CONDITION_EVENT_ONE]);
- cond->mEvents[_CONDITION_EVENT_ONE] = NULL;
- return bu_thrd_error;
- }
+ /* Init events */
+ cond->mEvents[_CONDITION_EVENT_ONE] = CreateEvent(NULL, FALSE, FALSE,
NULL);
+ if (cond->mEvents[_CONDITION_EVENT_ONE] == NULL)
+ {
+ cond->mEvents[_CONDITION_EVENT_ALL] = NULL;
+ return bu_thrd_error;
+ }
+ cond->mEvents[_CONDITION_EVENT_ALL] = CreateEvent(NULL, TRUE, FALSE, NULL);
+ if (cond->mEvents[_CONDITION_EVENT_ALL] == NULL)
+ {
+ CloseHandle(cond->mEvents[_CONDITION_EVENT_ONE]);
+ cond->mEvents[_CONDITION_EVENT_ONE] = NULL;
+ return bu_thrd_error;
+ }
- return bu_thrd_success;
+ return bu_thrd_success;
#else
- return pthread_cond_init(cond, NULL) == 0 ? bu_thrd_success : bu_thrd_error;
+ return pthread_cond_init(cond, NULL) == 0 ? bu_thrd_success :
bu_thrd_error;
#endif
}
-void bu_cnd_destroy(bu_cnd_t *cond)
+
+void
+bu_cnd_destroy(bu_cnd_t *cond)
{
#if defined(HAVE_WINDOWS_H)
- if (cond->mEvents[_CONDITION_EVENT_ONE] != NULL)
- {
- CloseHandle(cond->mEvents[_CONDITION_EVENT_ONE]);
- }
- if (cond->mEvents[_CONDITION_EVENT_ALL] != NULL)
- {
- CloseHandle(cond->mEvents[_CONDITION_EVENT_ALL]);
- }
- DeleteCriticalSection(&cond->mWaitersCountLock);
+ if (cond->mEvents[_CONDITION_EVENT_ONE] != NULL)
+ {
+ CloseHandle(cond->mEvents[_CONDITION_EVENT_ONE]);
+ }
+ if (cond->mEvents[_CONDITION_EVENT_ALL] != NULL)
+ {
+ CloseHandle(cond->mEvents[_CONDITION_EVENT_ALL]);
+ }
+ DeleteCriticalSection(&cond->mWaitersCountLock);
#else
- pthread_cond_destroy(cond);
+ pthread_cond_destroy(cond);
#endif
}
-int bu_mtx_lock(bu_mtx_t *mtx)
+
+in
+bu_mtx_lock(bu_mtx_t *mtx)
{
#if defined(HAVE_WINDOWS_H)
- if (!mtx->mTimed)
- {
- EnterCriticalSection(&(mtx->mHandle.cs));
- }
- else
- {
- switch (WaitForSingleObject(mtx->mHandle.mut, INFINITE))
+ if (!mtx->mTimed)
{
- case WAIT_OBJECT_0:
- break;
- case WAIT_ABANDONED:
- default:
- return bu_thrd_error;
+ EnterCriticalSection(&(mtx->mHandle.cs));
}
- }
+ else
+ {
+ switch (WaitForSingleObject(mtx->mHandle.mut, INFINITE))
+ {
+ case WAIT_OBJECT_0:
+ break;
+ case WAIT_ABANDONED:
+ default:
+ return bu_thrd_error;
+ }
+ }
- if (!mtx->mRecursive)
- {
- while(mtx->mAlreadyLocked) Sleep(1); /* Simulate deadlock... */
- mtx->mAlreadyLocked = TRUE;
- }
- return bu_thrd_success;
+ if (!mtx->mRecursive)
+ {
+ while(mtx->mAlreadyLocked) Sleep(1); /* Simulate deadlock... */
+ mtx->mAlreadyLocked = TRUE;
+ }
+ return bu_thrd_success;
#else
- return pthread_mutex_lock(mtx) == 0 ? bu_thrd_success : bu_thrd_error;
+ return pthread_mutex_lock(mtx) == 0 ? bu_thrd_success : bu_thrd_error;
#endif
}
-int bu_mtx_unlock(bu_mtx_t *mtx)
+
+int
+bu_mtx_unlock(bu_mtx_t *mtx)
{
#if defined(HAVE_WINDOWS_H)
- mtx->mAlreadyLocked = FALSE;
- if (!mtx->mTimed)
- {
- LeaveCriticalSection(&(mtx->mHandle.cs));
- }
- else
- {
- if (!ReleaseMutex(mtx->mHandle.mut))
+ mtx->mAlreadyLocked = FALSE;
+ if (!mtx->mTimed)
{
- return bu_thrd_error;
+ LeaveCriticalSection(&(mtx->mHandle.cs));
}
- }
- return bu_thrd_success;
+ else
+ {
+ if (!ReleaseMutex(mtx->mHandle.mut))
+ {
+ return bu_thrd_error;
+ }
+ }
+ return bu_thrd_success;
#else
- return pthread_mutex_unlock(mtx) == 0 ? bu_thrd_success : bu_thrd_error;;
+ return pthread_mutex_unlock(mtx) == 0 ? bu_thrd_success : bu_thrd_error;;
#endif
}
-int bu_mtx_trylock(bu_mtx_t *mtx)
+
+int
+bu_mtx_trylock(bu_mtx_t *mtx)
{
#if defined(HAVE_WINDOWS_H)
- int ret;
+ int ret;
- if (!mtx->mTimed)
+ if (!mtx->mTimed)
+ {
+ ret = TryEnterCriticalSection(&(mtx->mHandle.cs)) ? bu_thrd_success :
bu_thrd_busy;
+ }
+ else
+ {
+ ret = (WaitForSingleObject(mtx->mHandle.mut, 0) == WAIT_OBJECT_0) ?
bu_thrd_success : bu_thrd_busy;
+ }
+
+ if ((!mtx->mRecursive) && (ret == bu_thrd_success))
+ {
+ if (mtx->mAlreadyLocked)
{
- ret = TryEnterCriticalSection(&(mtx->mHandle.cs)) ?
bu_thrd_success : bu_thrd_busy;
+ LeaveCriticalSection(&(mtx->mHandle.cs));
+ ret = bu_thrd_busy;
}
else
{
- ret = (WaitForSingleObject(mtx->mHandle.mut, 0) ==
WAIT_OBJECT_0) ? bu_thrd_success : bu_thrd_busy;
+ mtx->mAlreadyLocked = TRUE;
}
-
- if ((!mtx->mRecursive) && (ret == bu_thrd_success))
- {
- if (mtx->mAlreadyLocked)
- {
- LeaveCriticalSection(&(mtx->mHandle.cs));
- ret = bu_thrd_busy;
- }
- else
- {
- mtx->mAlreadyLocked = TRUE;
- }
- }
- return ret;
+ }
+ return ret;
#else
- return pthread_mutex_trylock(mtx) == 0 ? bu_thrd_success :
bu_thrd_error;
+ return pthread_mutex_trylock(mtx) == 0 ? bu_thrd_success : bu_thrd_error;
#endif
}
-int bu_cnd_signal(bu_cnd_t *cond)
+int
+bu_cnd_signal(bu_cnd_t *cond)
{
#if defined(HAVE_WINDOWS_H)
- int haveWaiters;
+ int haveWaiters;
- /* Are there any waiters? */
- EnterCriticalSection(&cond->mWaitersCountLock);
- haveWaiters = (cond->mWaitersCount > 0);
- LeaveCriticalSection(&cond->mWaitersCountLock);
+ /* Are there any waiters? */
+ EnterCriticalSection(&cond->mWaitersCountLock);
+ haveWaiters = (cond->mWaitersCount > 0);
+ LeaveCriticalSection(&cond->mWaitersCountLock);
- /* If we have any waiting threads, send them a signal */
- if(haveWaiters)
- {
- if (SetEvent(cond->mEvents[_CONDITION_EVENT_ONE]) == 0)
+ /* If we have any waiting threads, send them a signal */
+ if(haveWaiters)
{
- return bu_thrd_error;
+ if (SetEvent(cond->mEvents[_CONDITION_EVENT_ONE]) == 0)
+ {
+ return bu_thrd_error;
+ }
}
- }
- return bu_thrd_success;
+ return bu_thrd_success;
#else
- return pthread_cond_signal(cond) == 0 ? bu_thrd_success : bu_thrd_error;
+ return pthread_cond_signal(cond) == 0 ? bu_thrd_success : bu_thrd_error;
#endif
}
@@ -225,68 +238,71 @@
#if defined(HAVE_WINDOWS_H)
static int _bu_cnd_timedwait_win32(bu_cnd_t *cond, bu_mtx_t *mtx, DWORD
timeout)
{
- DWORD result;
- int lastWaiter;
+ DWORD result;
+ int lastWaiter;
- /* Increment number of waiters */
- EnterCriticalSection(&cond->mWaitersCountLock);
- ++ cond->mWaitersCount;
- LeaveCriticalSection(&cond->mWaitersCountLock);
+ /* Increment number of waiters */
+ EnterCriticalSection(&cond->mWaitersCountLock);
+ ++ cond->mWaitersCount;
+ LeaveCriticalSection(&cond->mWaitersCountLock);
- /* Release the mutex while waiting for the condition (will decrease
- the number of waiters when done)... */
- bu_mtx_unlock(mtx);
+ /* Release the mutex while waiting for the condition (will decrease
+ the number of waiters when done)... */
+ bu_mtx_unlock(mtx);
- /* Wait for either event to become signaled due to cnd_signal() or
- cnd_broadcast() being called */
- result = WaitForMultipleObjects(2, cond->mEvents, FALSE, timeout);
- if (result == WAIT_TIMEOUT)
- {
- /* The mutex is locked again before the function returns, even if an error
occurred */
- bu_mtx_lock(mtx);
- return bu_thrd_timedout;
- }
- else if (result == WAIT_FAILED)
- {
- /* The mutex is locked again before the function returns, even if an error
occurred */
- bu_mtx_lock(mtx);
- return bu_thrd_error;
- }
+ /* Wait for either event to become signaled due to cnd_signal() or
+ cnd_broadcast() being called */
+ result = WaitForMultipleObjects(2, cond->mEvents, FALSE, timeout);
+ if (result == WAIT_TIMEOUT)
+ {
+ /* The mutex is locked again before the function returns, even if an
error occurred */
+ bu_mtx_lock(mtx);
+ return bu_thrd_timedout;
+ }
+ else if (result == WAIT_FAILED)
+ {
+ /* The mutex is locked again before the function returns, even if an
error occurred */
+ bu_mtx_lock(mtx);
+ return bu_thrd_error;
+ }
- /* Check if we are the last waiter */
- EnterCriticalSection(&cond->mWaitersCountLock);
- -- cond->mWaitersCount;
- lastWaiter = (result == (WAIT_OBJECT_0 + _CONDITION_EVENT_ALL)) &&
- (cond->mWaitersCount == 0);
- LeaveCriticalSection(&cond->mWaitersCountLock);
+ /* Check if we are the last waiter */
+ EnterCriticalSection(&cond->mWaitersCountLock);
+ -- cond->mWaitersCount;
+ lastWaiter = (result == (WAIT_OBJECT_0 + _CONDITION_EVENT_ALL)) &&
+ (cond->mWaitersCount == 0);
+ LeaveCriticalSection(&cond->mWaitersCountLock);
- /* If we are the last waiter to be notified to stop waiting, reset the event
*/
- if (lastWaiter)
- {
- if (ResetEvent(cond->mEvents[_CONDITION_EVENT_ALL]) == 0)
+ /* If we are the last waiter to be notified to stop waiting, reset the
event */
+ if (lastWaiter)
{
- /* The mutex is locked again before the function returns, even if an
error occurred */
- bu_mtx_lock(mtx);
- return bu_thrd_error;
+ if (ResetEvent(cond->mEvents[_CONDITION_EVENT_ALL]) == 0)
+ {
+ /* The mutex is locked again before the function returns, even if
an error occurred */
+ bu_mtx_lock(mtx);
+ return bu_thrd_error;
+ }
}
- }
- /* Re-acquire the mutex */
- bu_mtx_lock(mtx);
+ /* Re-acquire the mutex */
+ bu_mtx_lock(mtx);
- return bu_thrd_success;
+ return bu_thrd_success;
}
#endif
-int bu_cnd_wait(bu_cnd_t *cond, bu_mtx_t *mtx)
+
+int
+bu_cnd_wait(bu_cnd_t *cond, bu_mtx_t *mtx)
{
#if defined(HAVE_WINDOWS_H)
- return _bu_cnd_timedwait_win32(cond, mtx, INFINITE);
+ return _bu_cnd_timedwait_win32(cond, mtx, INFINITE);
#else
- return pthread_cond_wait(cond, mtx) == 0 ? bu_thrd_success : bu_thrd_error;
+ return pthread_cond_wait(cond, mtx) == 0 ? bu_thrd_success : bu_thrd_error;
#endif
}
+
#if defined(HAVE_WINDOWS_H)
typedef DWORD tss_t;
@@ -295,9 +311,9 @@
#define TSS_DTOR_ITERATIONS (4)
struct TinyCThreadTSSData {
- void* value;
- tss_t key;
- struct TinyCThreadTSSData* next;
+ void* value;
+ tss_t key;
+ struct TinyCThreadTSSData* next;
};
static tss_dtor_t _tinycthread_tss_dtors[1088] = { NULL, };
@@ -305,50 +321,54 @@
static _Thread_local struct TinyCThreadTSSData* _tinycthread_tss_head = NULL;
static _Thread_local struct TinyCThreadTSSData* _tinycthread_tss_tail = NULL;
-static void _tinycthread_tss_cleanup(void);
-static void _tinycthread_tss_cleanup(void) {
- struct TinyCThreadTSSData* data;
- int iteration;
- unsigned int again = 1;
- void* value;
+static void
+_tinycthread_tss_cleanup(void)
- for (iteration = 0; iteration < TSS_DTOR_ITERATIONS && again > 0;
iteration++)
+ struct TinyCThreadTSSData* data;
+ int iteration;
+ unsigned int again = 1;
+ void* value;
+
+ for (iteration = 0; iteration < TSS_DTOR_ITERATIONS && again > 0;
iteration++)
+ {
+ again = 0;
+ for (data = _tinycthread_tss_head; data != NULL; data = data->next)
{
- again = 0;
- for (data = _tinycthread_tss_head; data != NULL; data =
data->next)
+ if (data->value != NULL)
+ {
+ value = data->value;
+ data->value = NULL;
+
+ if (_tinycthread_tss_dtors[data->key] != NULL)
{
- if (data->value != NULL)
- {
- value = data->value;
- data->value = NULL;
-
- if (_tinycthread_tss_dtors[data->key] != NULL)
- {
- again = 1;
-
_tinycthread_tss_dtors[data->key](value);
- }
- }
+ again = 1;
+ _tinycthread_tss_dtors[data->key](value);
}
+ }
}
+ }
- while (_tinycthread_tss_head != NULL) {
- data = _tinycthread_tss_head->next;
- free(_tinycthread_tss_head);
- _tinycthread_tss_head = data;
- }
- _tinycthread_tss_head = NULL;
- _tinycthread_tss_tail = NULL;
+ while (_tinycthread_tss_head != NULL) {
+ data = _tinycthread_tss_head->next;
+ free(_tinycthread_tss_head);
+ _tinycthread_tss_head = data;
+ }
+ _tinycthread_tss_head = NULL;
+ _tinycthread_tss_tail = NULL;
}
-static void NTAPI _tinycthread_tss_callback(PVOID h, DWORD dwReason, PVOID pv)
+
+
+static void NTAPI
+_tinycthread_tss_callback(PVOID h, DWORD dwReason, PVOID pv)
{
- (void)h;
- (void)pv;
+ (void)h;
+ (void)pv;
- if (_tinycthread_tss_head != NULL && (dwReason == DLL_THREAD_DETACH ||
dwReason == DLL_PROCESS_DETACH))
- {
- _tinycthread_tss_cleanup();
- }
+ if (_tinycthread_tss_head != NULL && (dwReason == DLL_THREAD_DETACH ||
dwReason == DLL_PROCESS_DETACH))
+ {
+ _tinycthread_tss_cleanup();
+ }
}
#if defined(_MSC_VER)
@@ -372,11 +392,14 @@
} _bu_thread_start_info;
/* Thread wrapper function. */
+static DWORD WINAPI
+_bu_thrd_wrapper_function(
#if defined(HAVE_WINDOWS_H)
-static DWORD WINAPI _bu_thrd_wrapper_function(LPVOID aArg)
+ LPVOID aArg
#else
-static void * _bu_thrd_wrapper_function(void * aArg)
+ (void *) aArg
#endif
+ )
{
bu_thrd_start_t fun;
void *arg;
Modified: brlcad/trunk/src/libbu/tcllist.c
===================================================================
--- brlcad/trunk/src/libbu/tcllist.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/tcllist.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -59,7 +59,7 @@
_bu_tcl_utf_to_ushort(
register const char *src, /* The UTF-8 string. */
register unsigned short *chPtr)/* Filled with the unsigned short
represented by
- * the UTF-8 string. */
+ * the UTF-8 string. */
{
register int byte;
@@ -101,7 +101,7 @@
*/
*chPtr = (unsigned short) (((byte & 0x0F) << 12)
- | ((src[1] & 0x3F) << 6) | (src[2] & 0x3F));
+ | ((src[1] & 0x3F) << 6) | (src[2] &
0x3F));
return 3;
}
@@ -156,8 +156,8 @@
const char *src, /* First character to parse. */
int numBytes, /* Max number of byes to scan */
unsigned short *resultPtr) /* Points to storage provided by caller
where
- * the unsigned short resulting from the
- * conversion is to be written. */
+ * the unsigned short resulting from the
+ * conversion is to be written. */
{
unsigned short result = 0;
register const char *p = src;
@@ -243,108 +243,108 @@
* non-portable Tcl scripts.
*/
- case 'a':
- result = 0x7;
- break;
- case 'b':
- result = 0x8;
- break;
- case 'f':
- result = 0xc;
- break;
- case 'n':
- result = 0xa;
- break;
- case 'r':
- result = 0xd;
- break;
- case 't':
- result = 0x9;
- break;
- case 'v':
- result = 0xb;
- break;
- case 'x':
- count += _bu_tcl_parse_hex(p+1, numBytes-1, &result);
- if (count == 2) {
- /*
- * No hexadigits -> This is just "x".
- */
+ case 'a':
+ result = 0x7;
+ break;
+ case 'b':
+ result = 0x8;
+ break;
+ case 'f':
+ result = 0xc;
+ break;
+ case 'n':
+ result = 0xa;
+ break;
+ case 'r':
+ result = 0xd;
+ break;
+ case 't':
+ result = 0x9;
+ break;
+ case 'v':
+ result = 0xb;
+ break;
+ case 'x':
+ count += _bu_tcl_parse_hex(p+1, numBytes-1, &result);
+ if (count == 2) {
+ /*
+ * No hexadigits -> This is just "x".
+ */
- result = 'x';
- } else {
+ result = 'x';
+ } else {
+ /*
+ * Keep only the last byte (2 hex digits).
+ */
+ result = (unsigned char) result;
+ }
+ break;
+ case 'u':
+ count += _bu_tcl_parse_hex(p+1, (numBytes > 5) ? 4 : numBytes-1,
&result);
+ if (count == 2) {
+ /*
+ * No hexadigits -> This is just "u".
+ */
+ result = 'u';
+ }
+ break;
+ case '\n':
+ count--;
+ do {
+ p++;
+ count++;
+ } while ((count < numBytes) && ((*p == ' ') || (*p == '\t')));
+ result = ' ';
+ break;
+ case 0:
+ result = '\\';
+ count = 1;
+ break;
+ default:
/*
- * Keep only the last byte (2 hex digits).
+ * Check for an octal number \oo?o?
*/
- result = (unsigned char) result;
- }
- break;
- case 'u':
- count += _bu_tcl_parse_hex(p+1, (numBytes > 5) ? 4 : numBytes-1,
&result);
- if (count == 2) {
- /*
- * No hexadigits -> This is just "u".
- */
- result = 'u';
- }
- break;
- case '\n':
- count--;
- do {
- p++;
- count++;
- } while ((count < numBytes) && ((*p == ' ') || (*p == '\t')));
- result = ' ';
- break;
- case 0:
- result = '\\';
- count = 1;
- break;
- default:
- /*
- * Check for an octal number \oo?o?
- */
- if (isdigit((unsigned char)(*p)) && ((unsigned char)(*p) < '8')) { /*
INTL: digit */
- result = (unsigned char)(*p - '0');
- p++;
- if ((numBytes == 2) || !isdigit((unsigned char)(*p)) /* INTL:
digit */
+ if (isdigit((unsigned char)(*p)) && ((unsigned char)(*p) < '8')) {
/* INTL: digit */
+ result = (unsigned char)(*p - '0');
+ p++;
+ if ((numBytes == 2) || !isdigit((unsigned char)(*p)) /* INTL:
digit */
|| ((unsigned char)(*p) >= '8')) {
- break;
- }
- count = 3;
- result = (unsigned char)((result << 3) + (*p - '0'));
- p++;
- if ((numBytes == 3) || !isdigit((unsigned char)(*p)) /* INTL:
digit */
+ break;
+ }
+ count = 3;
+ result = (unsigned char)((result << 3) + (*p - '0'));
+ p++;
+ if ((numBytes == 3) || !isdigit((unsigned char)(*p)) /* INTL:
digit */
|| ((unsigned char)(*p) >= '8')) {
+ break;
+ }
+ count = 4;
+ result = (unsigned char)((result << 3) + (*p - '0'));
break;
}
- count = 4;
- result = (unsigned char)((result << 3) + (*p - '0'));
- break;
- }
- /*
- * We have to convert here in case the user has put a backslash in
- * front of a multi-byte utf-8 character. While this means nothing
- * special, we shouldn't break up a correct utf-8 character. [Bug
- * #217987] test subst-3.2
- */
+ /*
+ * We have to convert here in case the user has put a backslash in
+ * front of a multi-byte utf-8 character. While this means nothing
+ * special, we shouldn't break up a correct utf-8 character. [Bug
+ * #217987] test subst-3.2
+ */
- ch = *((unsigned char *) p);
- if (numBytes - 1 >= utf_byte_cnts[ch]) {
- count = _bu_tcl_utf_to_ushort(p, &result) + 1; /* +1 for '\' */
- } else {
- char utfBytes[3];
+ ch = *((unsigned char *) p);
+ if (numBytes - 1 >= utf_byte_cnts[ch]) {
+ count = _bu_tcl_utf_to_ushort(p, &result) + 1; /* +1 for '\'
*/
+ } else {
+ char utfBytes[3];
- memcpy(utfBytes, p, (size_t) (numBytes - 1));
- utfBytes[numBytes - 1] = '\0';
- count = _bu_tcl_utf_to_ushort(utfBytes, &result) + 1;
- }
- break;
+ memcpy(utfBytes, p, (size_t) (numBytes - 1));
+ utfBytes[numBytes - 1] = '\0';
+ count = _bu_tcl_utf_to_ushort(utfBytes, &result) + 1;
+ }
+ break;
}
- done:
+done:
if (readPtr != NULL) {
*readPtr = count;
}
@@ -418,81 +418,81 @@
* braces. In this case, keep a nesting count.
*/
- case '{':
- if (openBraces != 0) {
- openBraces++;
- }
- break;
+ case '{':
+ if (openBraces != 0) {
+ openBraces++;
+ }
+ break;
- /*
- * Close brace: if element is in braces, keep nesting count and
- * quit when the last close brace is seen.
- */
+ /*
+ * Close brace: if element is in braces, keep nesting count and
+ * quit when the last close brace is seen.
+ */
- case '}':
- if (openBraces > 1) {
- openBraces--;
- } else if (openBraces == 1) {
- size = (p - elemStart);
- p++;
- if ((p >= limit)
+ case '}':
+ if (openBraces > 1) {
+ openBraces--;
+ } else if (openBraces == 1) {
+ size = (p - elemStart);
+ p++;
+ if ((p >= limit)
|| isspace((unsigned char)(*p))) { /* INTL: ISO
space. */
- goto done;
+ goto done;
+ }
+
+ /*
+ * Garbage after the closing brace; return an error.
+ */
+ return 1;
}
+ break;
/*
- * Garbage after the closing brace; return an error.
+ * Backslash: skip over everything up to the end of the
backslash
+ * sequence.
*/
- return 1;
- }
- break;
- /*
- * Backslash: skip over everything up to the end of the backslash
- * sequence.
- */
+ case '\\':
+ (void)_bu_tcl_parse_backslash(p, (int)strlen(p), &numChars,
NULL);
+ p += (numChars - 1);
+ break;
- case '\\':
- (void)_bu_tcl_parse_backslash(p, (int)strlen(p), &numChars, NULL);
- p += (numChars - 1);
- break;
+ /*
+ * Space: ignore if element is in braces or quotes; otherwise
+ * terminate element.
+ */
- /*
- * Space: ignore if element is in braces or quotes; otherwise
- * terminate element.
- */
-
- case ' ':
- case '\f':
- case '\n':
- case '\r':
- case '\t':
- case '\v':
- if ((openBraces == 0) && !inQuotes) {
- size = (p - elemStart);
- goto done;
- }
- break;
-
- /*
- * Double-quote: if element is in quotes then terminate it.
- */
-
- case '"':
- if (inQuotes) {
- size = (p - elemStart);
- p++;
- if ((p >= limit)
- || isspace((unsigned char)(*p))) { /* INTL: ISO
space */
+ case ' ':
+ case '\f':
+ case '\n':
+ case '\r':
+ case '\t':
+ case '\v':
+ if ((openBraces == 0) && !inQuotes) {
+ size = (p - elemStart);
goto done;
}
+ break;
/*
- * Garbage after the closing quote; return an error.
+ * Double-quote: if element is in quotes then terminate it.
*/
- return 1;
- }
- break;
+
+ case '"':
+ if (inQuotes) {
+ size = (p - elemStart);
+ p++;
+ if ((p >= limit)
+ || isspace((unsigned char)(*p))) { /* INTL: ISO
space */
+ goto done;
+ }
+
+ /*
+ * Garbage after the closing quote; return an error.
+ */
+ return 1;
+ }
+ break;
}
p++;
}
@@ -509,7 +509,7 @@
size = (p - elemStart);
}
- done:
+done:
while ((p < limit) && (isspace((unsigned char)(*p)))) { /* INTL: ISO
space. */
p++;
}
Modified: brlcad/trunk/src/libbu/temp.c
===================================================================
--- brlcad/trunk/src/libbu/temp.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/temp.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -72,10 +72,10 @@
* to avoid the issue. */
#if defined(HAVE_WINDOWS_H)
static void disable_duplicate_close_check(const wchar_t* UNUSED(expression),
- const wchar_t* UNUSED(function),
- const wchar_t* UNUSED(file),
- unsigned int UNUSED(line),
- uintptr_t UNUSED(pReserved)) {}
+ const wchar_t* UNUSED(function),
+ const wchar_t* UNUSED(file),
+ unsigned int UNUSED(line),
+ uintptr_t UNUSED(pReserved)) {}
#endif
HIDDEN void
Modified: brlcad/trunk/src/libbu/tests/badmagic.c
===================================================================
--- brlcad/trunk/src/libbu/tests/badmagic.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/badmagic.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -71,36 +71,36 @@
sscanf(argv[1], "%d", &testnum);
switch (testnum) {
- case 1:
- *ptr = BU_AVS_MAGIC;
- magic = BU_BITV_MAGIC;
- str = (char *)bu_identify_magic(*(ptr));
- sprintf(expected_str, "ERROR: bad pointer %p: s/b %s(x%lx), was
%s(x%lx), file %s, line %d\n",
- (void *)ptr,
- str, (unsigned long)magic,
- bu_identify_magic(*(ptr)), (unsigned long)*(ptr),
- file, line);
- bu_badmagic(ptr, magic, str, file, line);
- return 1;
- case 2:
- return 0;
- case 3:
- ptr = NULL;
- magic = BU_VLS_MAGIC;
- str = (char *)bu_identify_magic(magic);
- sprintf(expected_str, "ERROR: NULL %s pointer, file %s, line %d\n",
- str, file, line);
- bu_badmagic(ptr, magic, str, file, line);
- return 1;
- case 4:
- misalign = (unsigned char *)ptr;
- ptr = (uint32_t *)(misalign + 1);
- magic = BU_EXTERNAL_MAGIC;
- str = (char *)bu_identify_magic(magic);
- sprintf(expected_str, "ERROR: %p mis-aligned %s pointer, file %s, line
%d\n",
- (void *)ptr, str, file, line);
- bu_badmagic(ptr, magic, str, file, line);
- return 1;
+ case 1:
+ *ptr = BU_AVS_MAGIC;
+ magic = BU_BITV_MAGIC;
+ str = (char *)bu_identify_magic(*(ptr));
+ sprintf(expected_str, "ERROR: bad pointer %p: s/b %s(x%lx), was
%s(x%lx), file %s, line %d\n",
+ (void *)ptr,
+ str, (unsigned long)magic,
+ bu_identify_magic(*(ptr)), (unsigned long)*(ptr),
+ file, line);
+ bu_badmagic(ptr, magic, str, file, line);
+ return 1;
+ case 2:
+ return 0;
+ case 3:
+ ptr = NULL;
+ magic = BU_VLS_MAGIC;
+ str = (char *)bu_identify_magic(magic);
+ sprintf(expected_str, "ERROR: NULL %s pointer, file %s, line %d\n",
+ str, file, line);
+ bu_badmagic(ptr, magic, str, file, line);
+ return 1;
+ case 4:
+ misalign = (unsigned char *)ptr;
+ ptr = (uint32_t *)(misalign + 1);
+ magic = BU_EXTERNAL_MAGIC;
+ str = (char *)bu_identify_magic(magic);
+ sprintf(expected_str, "ERROR: %p mis-aligned %s pointer, file %s,
line %d\n",
+ (void *)ptr, str, file, line);
+ bu_badmagic(ptr, magic, str, file, line);
+ return 1;
}
bu_log("Invalid function number %d specified. [%s]\n", testnum, argv[0]);
Modified: brlcad/trunk/src/libbu/tests/basename.c
===================================================================
--- brlcad/trunk/src/libbu/tests/basename.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/basename.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -39,13 +39,13 @@
char *
get_system_output(const char *input)
{
- char *in = input ? bu_strdup(input) : NULL;
- char *out = bu_strdup(basename(in));
+ char *in = input ? bu_strdup(input) : NULL;
+ char *out = bu_strdup(basename(in));
- if (in) {
- bu_free(in, "input copy");
- }
- return out;
+ if (in) {
+ bu_free(in, "input copy");
+ }
+ return out;
}
#endif
@@ -53,38 +53,38 @@
char *
get_system_output(const char *input)
{
- char fname[_MAX_FNAME];
- char dir[_MAX_DIR];
- char *base = NULL;
- if (input && !strlen(input) == 0) {
- char *in = bu_strdup(input);
- if (!strchr(in, '/') && !strchr(in, '\\')) return in;
- if (BU_STR_EQUAL(in, "/")) {
- base = bu_strdup("/");
- bu_free(in, "input copy");
- return base;
- }
- _splitpath(in, NULL, dir, fname, NULL);
- if (strlen(dir) != strlen(in) && strlen(fname) == 0 &&
in[strlen(in) - 1] == '.') {
- base = bu_strdup(&(in[strlen(in) - 1]));
- bu_free(in, "input copy");
- return base;
- }
- while (strlen(dir) > 1 && strlen(fname) == 0) {
- in[strlen(in) - 1] = '\0';
- _splitpath(in, NULL, dir, fname, NULL);
- }
- if (strlen(fname) > 0) {
- base = bu_strdup(fname);
- } else {
- if (in[strlen(in) - 1] == '/') {
- base = bu_strdup("/");
- }
- }
- bu_free(in, "input copy");
+ char fname[_MAX_FNAME];
+ char dir[_MAX_DIR];
+ char *base = NULL;
+ if (input && !strlen(input) == 0) {
+ char *in = bu_strdup(input);
+ if (!strchr(in, '/') && !strchr(in, '\\')) return in;
+ if (BU_STR_EQUAL(in, "/")) {
+ base = bu_strdup("/");
+ bu_free(in, "input copy");
+ return base;
+ }
+ _splitpath(in, NULL, dir, fname, NULL);
+ if (strlen(dir) != strlen(in) && strlen(fname) == 0 && in[strlen(in) -
1] == '.') {
+ base = bu_strdup(&(in[strlen(in) - 1]));
+ bu_free(in, "input copy");
+ return base;
+ }
+ while (strlen(dir) > 1 && strlen(fname) == 0) {
+ in[strlen(in) - 1] = '\0';
+ _splitpath(in, NULL, dir, fname, NULL);
+ }
+ if (strlen(fname) > 0) {
+ base = bu_strdup(fname);
} else {
- base = bu_strdup(".");
+ if (in[strlen(in) - 1] == '/') {
+ base = bu_strdup("/");
+ }
}
+ bu_free(in, "input copy");
+ } else {
+ base = bu_strdup(".");
+ }
return base;
}
#endif
@@ -136,8 +136,8 @@
/* If we have something, print it and test it */
if (argc > 1) {
- bu_log("Testing string \"%s\"\n", argv[1]);
- compare_bu_to_system_basename(argv[1]);
+ bu_log("Testing string \"%s\"\n", argv[1]);
+ compare_bu_to_system_basename(argv[1]);
}
return 0;
Modified: brlcad/trunk/src/libbu/tests/dirname.c
===================================================================
--- brlcad/trunk/src/libbu/tests/dirname.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/dirname.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -77,10 +77,10 @@
main(int argc, char *argv[])
{
if (argc > 2)
- fprintf(stderr, "Usage: %s {test_string}\n", argv[0]);
+ fprintf(stderr, "Usage: %s {test_string}\n", argv[0]);
if (argc == 1)
- return !automatic_test(NULL);
+ return !automatic_test(NULL);
return !automatic_test(argv[1]);
}
Modified: brlcad/trunk/src/libbu/tests/encode.c
===================================================================
--- brlcad/trunk/src/libbu/tests/encode.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/encode.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -61,7 +61,7 @@
printf("{%*s}%*s -> {%*s}%*s [PASS]\n",
(int)len_s, str, (int)(f_wid - len_s), " ",
(int)len_d, bu_vls_addr(&decoded), (int)(f_wid - len_d), " "
- );
+ );
} else {
/* a hack for str showing '(null)' in printf if zero length */
if (len_s == 0)
@@ -70,7 +70,7 @@
(int)len_s, str, (int)(f_wid - len_s), " ",
(int)len_d, bu_vls_addr(&decoded), (int)(f_wid - len_d), " ",
str
- );
+ );
status = 1;
}
Modified: brlcad/trunk/src/libbu/tests/file.c
===================================================================
--- brlcad/trunk/src/libbu/tests/file.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/tests/file.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -111,7 +111,7 @@
bu_exit(1, "%s [FAIL] %s should contain %d files, found %zd\n",
av[0], tdir, file_cnt, count);
}
/* bu_file_list doesn't guarantee ordering, but make sure each lfiles
entry matches the pattern */
- for (size_t c = 0; c < count; c++) {
+ for (size_t c = 0; c < count; c++) {
if (bu_path_match(pattern, lfiles[c], 0)) {
bu_exit(1, "%s [FAIL] file array entry %zd (%s) doesn't match
the bu file test pattern \"%s\"\n", av[0], c, lfiles[c], pattern);
}
Modified: brlcad/trunk/src/libbu/tests/hash.cpp
===================================================================
--- brlcad/trunk/src/libbu/tests/hash.cpp 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/hash.cpp 2019-05-20 02:08:41 UTC (rev
73089)
@@ -30,7 +30,8 @@
/* Slightly tweaked and reformatted text originally generated from libsum.com -
* 275 words, one of which is an empty string (position 195 after "feugiat.")
* to test behavior in the NULL conditions */
-const char *lorem_ipsum[] = {"Lorem", "ipsum", "dolor", "sit", "amet,",
+const char *lorem_ipsum[] = {
+ "Lorem", "ipsum", "dolor", "sit", "amet,",
"consectetur", "adipiscing", "elit.", "Nulla", "quis", "neque", "egetdui",
"consequat", "sodales.", "Cras", "vitae", "quam", "ut", "neque", "rutrum",
"posuere", "gravida", "a", "nisi.Pellentesque", "quis", "eros",
@@ -70,7 +71,8 @@
"suscipit", "ex", "leo,", "sit", "amet", "sollicitudin", "odio",
"laoreetvel.", "Phasellus", "tellus", "felis,", "blandit", "vitae", "est",
"vel,", "consectetur", "molestie", "dolor.Donec", "vitae", "eros", "odio.",
- "Nullam", "tempus", "auctor."};
+ "Nullam", "tempus", "auctor."
+};
const char *array1[] = {
"1",
@@ -204,15 +206,15 @@
}
switch (test_num) {
- case 0:
- ret = hash_noop_test();
- break;
- case 1:
- ret = hash_add_del_one();
- break;
- case 2:
- ret = hash_loremipsum();
- break;
+ case 0:
+ ret = hash_noop_test();
+ break;
+ case 1:
+ ret = hash_add_del_one();
+ break;
+ case 2:
+ ret = hash_loremipsum();
+ break;
}
return ret;
Modified: brlcad/trunk/src/libbu/tests/humanize_number.c
===================================================================
--- brlcad/trunk/src/libbu/tests/humanize_number.c 2019-05-20 02:07:09 UTC
(rev 73088)
+++ brlcad/trunk/src/libbu/tests/humanize_number.c 2019-05-20 02:08:41 UTC
(rev 73089)
@@ -281,7 +281,7 @@
/* Need to implement tests for GETSCALE */
/* { ?, "", (int64_t)0L, BU_HN_DIVISOR_1000, BU_HN_GETSCALE },
...
- */
+ */
/* Tests for BU_HN_DECIMAL */
/* Positive, Autoscale */
{ 5, "500 k", (int64_t)500*1000L, BU_HN_DECIMAL|BU_HN_DIVISOR_1000,
BU_HN_AUTOSCALE },
@@ -400,7 +400,7 @@
/* Parse command line options */
static void
read_options(int argc, char * const argv[], size_t *bufLength,
- int *includeNegativeScale, int *includeExabytes, int *verbose) {
+ int *includeNegativeScale, int *includeExabytes, int *verbose) {
int ch;
size_t temp;
@@ -458,7 +458,7 @@
if (hn_flags & flags[i].value) {
if (*result != 0)
bu_strlcat(result, separator,
- MAX_STR_FLAGS_RESULT);
+ MAX_STR_FLAGS_RESULT);
bu_strlcat(result, flags[i].name, MAX_STR_FLAGS_RESULT);
}
}
@@ -509,7 +509,7 @@
verbose = 0;
read_options(argc, argv, &buflen, &includeNegScale,
- &includeExabyteTests, &verbose);
+ &includeExabyteTests, &verbose);
buf = (char *)bu_malloc(buflen, NULL);
errcnt = 0;
@@ -543,7 +543,7 @@
}
r = bu_humanize_number(buf, buflen, test_args[i].num, "",
- test_args[i].scale, test_args[i].flags);
+ test_args[i].scale, test_args[i].flags);
flag_str = str_flags(test_args[i].flags, "[no flags]");
scale_str = str_scale(test_args[i].scale);
@@ -550,27 +550,27 @@
if (r != test_args[i].retval) {
if (verbose)
bu_log("wrong return value on index %lu, buflen: %zu, got: %d +
\"%s\", expected %d + \"%s\"; num = %" PRId64 ", scale = %s, flags= %s.\n",
- i, buflen, r, buf, test_args[i].retval,
- test_args[i].res, test_args[i].num,
- scale_str, flag_str);
+ i, buflen, r, buf, test_args[i].retval,
+ test_args[i].res, test_args[i].num,
+ scale_str, flag_str);
else
printf("not ok %lu # return %d != %d\n", (long unsigned int)i,
r,
- test_args[i].retval);
+ test_args[i].retval);
errcnt++;
} else if (bu_strcmp(buf, test_args[i].res) != 0) {
if (verbose)
printf("result mismatch on index %lu, got: \"%s\", expected
\"%s\"; num = %" PRId64 ", scale = %s, flags= %s.\n",
- (long unsigned int)i, buf, test_args[i].res,
test_args[i].num,
- scale_str, flag_str);
+ (long unsigned int)i, buf, test_args[i].res,
test_args[i].num,
+ scale_str, flag_str);
else
printf("not ok %lu # buf \"%s\" != \"%s\"\n", (long unsigned
int)i,
- buf, test_args[i].res);
+ buf, test_args[i].res);
errcnt++;
} else {
if (verbose)
printf("successful result on index %lu, returned %d, got:
\"%s\"; num = %" PRId64 ", scale = %s, flags= %s.\n",
- (long unsigned int)i, r, buf, test_args[i].num,
scale_str,
- flag_str);
+ (long unsigned int)i, r, buf, test_args[i].num,
scale_str,
+ flag_str);
else
printf("ok %lu\n", (long unsigned int)i);
}
@@ -579,7 +579,7 @@
if (verbose)
printf("total errors: %lu/%lu tests, %lu skipped\n", (long unsigned
int)errcnt,
- (long unsigned int)tested, (long unsigned int)skipped);
+ (long unsigned int)tested, (long unsigned int)skipped);
if (errcnt)
return 1;
Modified: brlcad/trunk/src/libbu/tests/mappedfile.c
===================================================================
--- brlcad/trunk/src/libbu/tests/mappedfile.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/mappedfile.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -287,10 +287,10 @@
/* Run our test */
switch(test_num) {
- case 1:
+ case 1:
ret = test_mapped_file_serial(file_cnt, test_num);
break;
- case 2:
+ case 2:
ret = test_mapped_file_parallel(file_cnt, test_num);
break;
case 3:
Modified: brlcad/trunk/src/libbu/tests/opt.c
===================================================================
--- brlcad/trunk/src/libbu/tests/opt.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/tests/opt.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -67,129 +67,131 @@
}
#define EXPECT_SUCCESS_FLAG(_name, _var) { \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- if (ret || _var != 1) { \
- bu_vls_printf(&parse_msgs, "\nError - expected value \"1\" and got
value %d\n", _var); \
- val_ok = 0; \
- } else { \
- bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %d\n", _name,
_var); \
- } \
-}
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ if (ret || _var != 1) { \
+ bu_vls_printf(&parse_msgs, "\nError - expected value \"1\" and got
value %d\n", _var); \
+ val_ok = 0; \
+ } else { \
+ bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %d\n",
_name, _var); \
+ } \
+ }
#define EXPECT_SUCCESS_INT(_name, _var, _exp) { \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- if (ret || _var != _exp) { \
- bu_vls_printf(&parse_msgs, "\nError - expected value \"%ld\" and got
value %ld\n", (long int)_exp, (long int)_var); \
- val_ok = 0; \
- } else { \
- bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %ld\n", _name,
(long int)_var); \
- } \
-}
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ if (ret || _var != _exp) { \
+ bu_vls_printf(&parse_msgs, "\nError - expected value \"%ld\" and
got value %ld\n", (long int)_exp, (long int)_var); \
+ val_ok = 0; \
+ } else { \
+ bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %ld\n",
_name, (long int)_var); \
+ } \
+ }
#define EXPECT_SUCCESS_INT_UNKNOWN(_name, _var, _exp) { \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- if (ret <= 0) { \
- bu_vls_printf(&parse_msgs, "\nError - extra args but none found.\n"); \
- val_ok = 0; \
- } else { \
- if ( _var != _exp) { \
- bu_vls_printf(&parse_msgs, "\nError - expected value \"%d\" and got
value %d\n", _exp, _var); \
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ if (ret <= 0) { \
+ bu_vls_printf(&parse_msgs, "\nError - extra args but none
found.\n"); \
val_ok = 0; \
} else { \
- bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %d\n",
_name, _var); \
- }} \
-}
+ if ( _var != _exp) { \
+ bu_vls_printf(&parse_msgs, "\nError - expected value \"%d\" and
got value %d\n", _exp, _var); \
+ val_ok = 0; \
+ } else { \
+ bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %d\n",
_name, _var); \
+ } \
+ } \
+ }
#define EXPECT_FAILURE_INT_UNKNOWN(_name, _var, _exp) { \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- if (ret <= 0 || _var == _exp) { \
- bu_vls_printf(&parse_msgs, "\nError - expected failure (%s) but no
error returned\n", _name); \
- val_ok = 0; \
- } else { \
- bu_vls_printf(&parse_msgs, " \nOK (expected failure) %s\n", _name); \
- } \
-}
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ if (ret <= 0 || _var == _exp) { \
+ bu_vls_printf(&parse_msgs, "\nError - expected failure (%s) but no
error returned\n", _name); \
+ val_ok = 0; \
+ } else { \
+ bu_vls_printf(&parse_msgs, " \nOK (expected failure) %s\n",
_name); \
+ } \
+ }
#define EXPECT_SUCCESS_FLOAT(_name, _var, _exp) { \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- if (ret || !NEAR_EQUAL(_var, _exp, SMALL_FASTF)) { \
- bu_vls_printf(&parse_msgs, "\nError - expected value \"%f\" and got
value %f\n", _exp, _var); \
- val_ok = 0; \
- } else { \
- bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %f\n", _name,
_var); \
- } \
-}
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ if (ret || !NEAR_EQUAL(_var, _exp, SMALL_FASTF)) { \
+ bu_vls_printf(&parse_msgs, "\nError - expected value \"%f\" and got
value %f\n", _exp, _var); \
+ val_ok = 0; \
+ } else { \
+ bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %f\n",
_name, _var); \
+ } \
+ }
#define EXPECT_SUCCESS_STRING(_name, _var, _exp) { \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- if (ret || !BU_STR_EQUAL(_var, _exp)) { \
- bu_vls_printf(&parse_msgs, "\nError - expected value \"%s\" and got
value %s\n", _exp, _var); \
- val_ok = 0; \
- } else { \
- bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %s\n", _name,
_var); \
- } \
-}
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ if (ret || !BU_STR_EQUAL(_var, _exp)) { \
+ bu_vls_printf(&parse_msgs, "\nError - expected value \"%s\" and got
value %s\n", _exp, _var); \
+ val_ok = 0; \
+ } else { \
+ bu_vls_printf(&parse_msgs, " \nGot expected value: %s = %s\n",
_name, _var); \
+ } \
+ }
#define EXPECT_SUCCESS_COLOR(_name, _color, _r, _g, _b) { \
- unsigned char rgb[3] = {0, 0, 0}; \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- bu_color_to_rgb_chars(&_color, rgb); \
- if (ret || (!NEAR_EQUAL(rgb[RED], _r, SMALL_FASTF) ||
!NEAR_EQUAL(rgb[GRN], _g, SMALL_FASTF) || !NEAR_EQUAL(rgb[BLU], _b,
SMALL_FASTF))) { \
- bu_vls_printf(&parse_msgs, "\nError - expected value \"%d/%d/%d\" and
got value %d/%d/%d\n", _r, _g, _b, rgb[RED], rgb[GRN], rgb[BLU]); \
- val_ok = 0; \
- } else { \
- bu_vls_printf(&parse_msgs, " \nGot expected value: %s == %d/%d/%d\n",
_name, rgb[RED], rgb[GRN], rgb[BLU]); \
- } \
-}
-
-#define EXPECT_SUCCESS_COLOR_UNKNOWN(_name, _color, _r, _g, _b) { \
- unsigned char rgb[3] = {0, 0, 0}; \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- bu_color_to_rgb_chars(&_color, rgb); \
- if (ret <= 0) { \
- bu_vls_printf(&parse_msgs, "\nError - extra args expected but not
found\n"); \
- val_ok = 0; \
- } else { \
- if ((!NEAR_EQUAL(rgb[RED], _r, SMALL_FASTF) || !NEAR_EQUAL(rgb[GRN],
_g, SMALL_FASTF) || !NEAR_EQUAL(rgb[BLU], _b, SMALL_FASTF))) { \
+ unsigned char rgb[3] = {0, 0, 0}; \
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ bu_color_to_rgb_chars(&_color, rgb); \
+ if (ret || (!NEAR_EQUAL(rgb[RED], _r, SMALL_FASTF) ||
!NEAR_EQUAL(rgb[GRN], _g, SMALL_FASTF) || !NEAR_EQUAL(rgb[BLU], _b,
SMALL_FASTF))) { \
bu_vls_printf(&parse_msgs, "\nError - expected value \"%d/%d/%d\"
and got value %d/%d/%d\n", _r, _g, _b, rgb[RED], rgb[GRN], rgb[BLU]); \
val_ok = 0; \
} else { \
bu_vls_printf(&parse_msgs, " \nGot expected value: %s ==
%d/%d/%d\n", _name, rgb[RED], rgb[GRN], rgb[BLU]); \
- }} \
-}
+ } \
+ }
+#define EXPECT_SUCCESS_COLOR_UNKNOWN(_name, _color, _r, _g, _b) { \
+ unsigned char rgb[3] = {0, 0, 0}; \
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ bu_color_to_rgb_chars(&_color, rgb); \
+ if (ret <= 0) { \
+ bu_vls_printf(&parse_msgs, "\nError - extra args expected but not
found\n"); \
+ val_ok = 0; \
+ } else { \
+ if ((!NEAR_EQUAL(rgb[RED], _r, SMALL_FASTF) ||
!NEAR_EQUAL(rgb[GRN], _g, SMALL_FASTF) || !NEAR_EQUAL(rgb[BLU], _b,
SMALL_FASTF))) { \
+ bu_vls_printf(&parse_msgs, "\nError - expected value
\"%d/%d/%d\" and got value %d/%d/%d\n", _r, _g, _b, rgb[RED], rgb[GRN],
rgb[BLU]); \
+ val_ok = 0; \
+ } else { \
+ bu_vls_printf(&parse_msgs, " \nGot expected value: %s ==
%d/%d/%d\n", _name, rgb[RED], rgb[GRN], rgb[BLU]); \
+ } \
+ } \
+ }
+
#define EXPECT_SUCCESS_VECT(_name, _v, _v1, _v2, _v3) { \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- if (ret || (!NEAR_EQUAL(_v[0], _v1, SMALL_FASTF) || !NEAR_EQUAL(_v[1],
_v2, SMALL_FASTF) || !NEAR_EQUAL(_v[2], _v3, SMALL_FASTF))) { \
- bu_vls_printf(&parse_msgs, "\nError - expected value \"%f/%f/%f\" and
got value %f/%f/%f\n", _v1, _v2, _v3, _v[0], _v[1], _v[2]); \
- val_ok = 0; \
- } else { \
- bu_vls_printf(&parse_msgs, " \nGot expected value: %s == %f/%f/%f\n",
_name, _v[0], _v[1], _v[2]); \
- } \
-}
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ if (ret || (!NEAR_EQUAL(_v[0], _v1, SMALL_FASTF) || !NEAR_EQUAL(_v[1],
_v2, SMALL_FASTF) || !NEAR_EQUAL(_v[2], _v3, SMALL_FASTF))) { \
+ bu_vls_printf(&parse_msgs, "\nError - expected value \"%f/%f/%f\"
and got value %f/%f/%f\n", _v1, _v2, _v3, _v[0], _v[1], _v[2]); \
+ val_ok = 0; \
+ } else { \
+ bu_vls_printf(&parse_msgs, " \nGot expected value: %s ==
%f/%f/%f\n", _name, _v[0], _v[1], _v[2]); \
+ } \
+ }
#define EXPECT_FAILURE(_name, _reason) { \
- set_msg_str(&parse_msgs, ac, av); \
- ret = bu_opt_parse(&parse_msgs, ac, av, d); \
- if (ret != -1) { \
- bu_vls_printf(&parse_msgs, "\nError - expected parser to fail with
error and it didn't\n"); \
- val_ok = 0; \
- } else { \
- bu_vls_printf(&parse_msgs, " \nOK (expected failure) - %s failed
(%s)\n", _name, _reason); \
- ret = 0; \
- } \
-}
+ set_msg_str(&parse_msgs, ac, av); \
+ ret = bu_opt_parse(&parse_msgs, ac, av, d); \
+ if (ret != -1) { \
+ bu_vls_printf(&parse_msgs, "\nError - expected parser to fail with
error and it didn't\n"); \
+ val_ok = 0; \
+ } else { \
+ bu_vls_printf(&parse_msgs, " \nOK (expected failure) - %s failed
(%s)\n", _name, _reason); \
+ ret = 0; \
+ } \
+ }
int desc_1(const char *cgy, int test_num)
@@ -788,7 +790,7 @@
av[4] = "50";
EXPECT_FAILURE("color", "invalid argument");
break;
- case 16:
+ case 16:
ac = 1;
av[0] = "-C0/0/50";
EXPECT_SUCCESS_COLOR("color", color, 0, 0, 50);
Modified: brlcad/trunk/src/libbu/tests/semchk.cxx
===================================================================
--- brlcad/trunk/src/libbu/tests/semchk.cxx 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/semchk.cxx 2019-05-20 02:08:41 UTC (rev
73089)
@@ -61,8 +61,8 @@
size_t ep = s.find_last_not_of(" \t\n\v\f\r");
size_t sp = s.find_first_not_of(" \t\n\v\f\r");
if (sp == std::string::npos) {
- s.clear();
- return;
+ s.clear();
+ return;
}
s = s.substr(sp, ep-sp+1);
}
@@ -91,13 +91,13 @@
std::string val = std::string(sdef[2]);
std::replace(val.begin(), val.end(), '(', ' ');
std::replace(val.begin(), val.end(), ')', ' ');
- _trim_whitespace(key);
- _trim_whitespace(val);
- if (sem_defs->find(key) != sem_defs->end()) {
- std::cerr << "Error - duplicate definition of semaphore "
<< key << " found in file " << f << "\n";
- std::cerr << "Previous definition found in file " <<
(*sem_files)[key] << "\n";
- exit(-1);
- }
+ _trim_whitespace(key);
+ _trim_whitespace(val);
+ if (sem_defs->find(key) != sem_defs->end()) {
+ std::cerr << "Error - duplicate definition of semaphore "
<< key << " found in file " << f << "\n";
+ std::cerr << "Previous definition found in file " <<
(*sem_files)[key] << "\n";
+ exit(-1);
+ }
(*sem_defs)[key] = val;
(*sem_files)[key] = f;
ret++;
Modified: brlcad/trunk/src/libbu/tests/sscanf.c
===================================================================
--- brlcad/trunk/src/libbu/tests/sscanf.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/sscanf.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -149,26 +149,26 @@
}
#define CHECK_INT_VALS_EQUAL(int_type, valp, bu_valp) \
-{ \
- int_type _val = *(int_type*)(valp); \
- int_type _bu_val = *(int_type*)(bu_valp); \
- if (_val != _bu_val) { \
- bu_exit(1, "\t[FAIL] conversion value mismatch.\n" \
- "\t(sscanf) %lld != %lld (bu_sscanf).\n", \
- (long long int)_val, (long long int)_bu_val); \
- } \
-}
+ { \
+ int_type _val = *(int_type*)(valp); \
+ int_type _bu_val = *(int_type*)(bu_valp); \
+ if (_val != _bu_val) { \
+ bu_exit(1, "\t[FAIL] conversion value mismatch.\n" \
+ "\t(sscanf) %lld != %lld (bu_sscanf).\n", \
+ (long long int)_val, (long long int)_bu_val); \
+ } \
+ }
#define CHECK_FLOAT_VALS_EQUAL(float_type, valp, bu_valp) \
-{ \
- float_type _val = *(float_type*)(valp); \
- float_type _bu_val = *(float_type*)(bu_valp); \
- if (!NEAR_EQUAL(_val, _bu_val, TS_FLOAT_TOL)) { \
- bu_exit(1, "\t[FAIL] conversion value mismatch.\n" \
- "\t(sscanf) %Le != %Le (bu_sscanf).\n", \
- (long double)_val, (long double)_bu_val); \
- } \
-}
+ { \
+ float_type _val = *(float_type*)(valp); \
+ float_type _bu_val = *(float_type*)(bu_valp); \
+ if (!NEAR_EQUAL(_val, _bu_val, TS_FLOAT_TOL)) { \
+ bu_exit(1, "\t[FAIL] conversion value mismatch.\n" \
+ "\t(sscanf) %Le != %Le (bu_sscanf).\n", \
+ (long double)_val, (long double)_bu_val); \
+ } \
+ }
static void
test_sscanf(int type, const char *src, const char *fmt) {
@@ -192,74 +192,74 @@
checkReturnsEqual(bu_ret, ret);
switch (type) {
- case SCAN_INT:
- SSCANF_TYPE(int);
- CHECK_INT_VALS_EQUAL(int, val, bu_val);
- break;
- case SCAN_UINT:
- SSCANF_TYPE(unsigned);
- CHECK_INT_VALS_EQUAL(unsigned, val, bu_val);
- break;
- case SCAN_SHORT:
- SSCANF_TYPE(short);
- CHECK_INT_VALS_EQUAL(short, val, bu_val);
- break;
- case SCAN_USHORT:
- SSCANF_TYPE(unsigned short);
- CHECK_INT_VALS_EQUAL(unsigned short, val, bu_val);
- break;
- case SCAN_SHORTSHORT:
- SSCANF_TYPE(char);
- CHECK_INT_VALS_EQUAL(char, val, bu_val);
- break;
- case SCAN_USHORTSHORT:
- SSCANF_TYPE(unsigned char);
- CHECK_INT_VALS_EQUAL(unsigned char, val, bu_val);
- break;
- case SCAN_LONG:
- SSCANF_TYPE(long);
- CHECK_INT_VALS_EQUAL(long, val, bu_val);
- break;
- case SCAN_ULONG:
- SSCANF_TYPE(unsigned long);
- CHECK_INT_VALS_EQUAL(unsigned long, val, bu_val);
- break;
- case SCAN_SIZE:
- SSCANF_TYPE(size_t);
- CHECK_INT_VALS_EQUAL(size_t, val, bu_val);
- break;
- case SCAN_PTRDIFF:
- SSCANF_TYPE(ptrdiff_t);
- CHECK_INT_VALS_EQUAL(ptrdiff_t, val, bu_val);
- break;
- case SCAN_POINTER:
- ret = sscanf(src, fmt, &val);
- bu_ret = bu_sscanf(src, fmt, &bu_val);
+ case SCAN_INT:
+ SSCANF_TYPE(int);
+ CHECK_INT_VALS_EQUAL(int, val, bu_val);
+ break;
+ case SCAN_UINT:
+ SSCANF_TYPE(unsigned);
+ CHECK_INT_VALS_EQUAL(unsigned, val, bu_val);
+ break;
+ case SCAN_SHORT:
+ SSCANF_TYPE(short);
+ CHECK_INT_VALS_EQUAL(short, val, bu_val);
+ break;
+ case SCAN_USHORT:
+ SSCANF_TYPE(unsigned short);
+ CHECK_INT_VALS_EQUAL(unsigned short, val, bu_val);
+ break;
+ case SCAN_SHORTSHORT:
+ SSCANF_TYPE(char);
+ CHECK_INT_VALS_EQUAL(char, val, bu_val);
+ break;
+ case SCAN_USHORTSHORT:
+ SSCANF_TYPE(unsigned char);
+ CHECK_INT_VALS_EQUAL(unsigned char, val, bu_val);
+ break;
+ case SCAN_LONG:
+ SSCANF_TYPE(long);
+ CHECK_INT_VALS_EQUAL(long, val, bu_val);
+ break;
+ case SCAN_ULONG:
+ SSCANF_TYPE(unsigned long);
+ CHECK_INT_VALS_EQUAL(unsigned long, val, bu_val);
+ break;
+ case SCAN_SIZE:
+ SSCANF_TYPE(size_t);
+ CHECK_INT_VALS_EQUAL(size_t, val, bu_val);
+ break;
+ case SCAN_PTRDIFF:
+ SSCANF_TYPE(ptrdiff_t);
+ CHECK_INT_VALS_EQUAL(ptrdiff_t, val, bu_val);
+ break;
+ case SCAN_POINTER:
+ ret = sscanf(src, fmt, &val);
+ bu_ret = bu_sscanf(src, fmt, &bu_val);
- checkReturnVal("sscanf", ret, 1);
- checkReturnsEqual(bu_ret, ret);
+ checkReturnVal("sscanf", ret, 1);
+ checkReturnsEqual(bu_ret, ret);
- if (val != bu_val) {
- bu_exit(1, "\t[FAIL] conversion value mismatch.\n"
- "\t(sscanf) %p != %p (bu_sscanf).\n",
- val, bu_val);
- }
- val = bu_val = NULL;
- break;
- case SCAN_FLOAT:
- SSCANF_TYPE(float);
- CHECK_FLOAT_VALS_EQUAL(float, val, bu_val);
- break;
- case SCAN_DOUBLE:
- SSCANF_TYPE(double);
- CHECK_FLOAT_VALS_EQUAL(double, val, bu_val);
- break;
- case SCAN_LDOUBLE:
- SSCANF_TYPE(long double);
- CHECK_FLOAT_VALS_EQUAL(long double, val, bu_val);
- break;
- default:
- bu_exit(1, "Error: test_sscanf was given an unrecognized pointer
type.\n");
+ if (val != bu_val) {
+ bu_exit(1, "\t[FAIL] conversion value mismatch.\n"
+ "\t(sscanf) %p != %p (bu_sscanf).\n",
+ val, bu_val);
+ }
+ val = bu_val = NULL;
+ break;
+ case SCAN_FLOAT:
+ SSCANF_TYPE(float);
+ CHECK_FLOAT_VALS_EQUAL(float, val, bu_val);
+ break;
+ case SCAN_DOUBLE:
+ SSCANF_TYPE(double);
+ CHECK_FLOAT_VALS_EQUAL(double, val, bu_val);
+ break;
+ case SCAN_LDOUBLE:
+ SSCANF_TYPE(long double);
+ CHECK_FLOAT_VALS_EQUAL(long double, val, bu_val);
+ break;
+ default:
+ bu_exit(1, "Error: test_sscanf was given an unrecognized pointer
type.\n");
}
if (val != NULL) {
bu_free(val, "test_sscanf val");
@@ -567,7 +567,7 @@
ret = sscanf(src, fmt, str_vals[0], str_vals[1], str_vals[2]);
bu_ret = bu_sscanf(src, fmt, bu_str_vals[0], bu_str_vals[1],
- bu_str_vals[2]);
+ bu_str_vals[2]);
checkReturnVal("sscanf", ret, 3);
checkReturnsEqual(bu_ret, ret);
@@ -664,21 +664,21 @@
* If src is empty, should return EOF to indicate input failure.
*/
#define TEST_FAILURE_1(type, type_fmt, type_init, src, expected_err) \
-{ \
- type vals[3] = { type_init, type_init, type_init }; \
- print_src_and_fmt(src, FMT_ASSIGN3(type_fmt)); \
- ret = sscanf(src, FMT_ASSIGN3(type_fmt), &vals[0], &vals[1], &vals[2]); \
- bu_ret = sscanf(src, FMT_ASSIGN3(type_fmt), &vals[0], &vals[1], &vals[2]);
\
- checkReturnVal("sscanf", ret, expected_err); \
- checkReturnsEqual(ret, bu_ret); \
- for (i = 0; i < 3; ++i) { \
- if (vals[i] != type_init) { \
- bu_exit(1, "\t[FAIL] No assignment expected, but vals[%d] " \
- "changed from %" CPP_STR(type_fmt) " to %"
CPP_STR(type_fmt) ".\n", \
- i, type_init, vals[i]); \
+ { \
+ type vals[3] = { type_init, type_init, type_init }; \
+ print_src_and_fmt(src, FMT_ASSIGN3(type_fmt)); \
+ ret = sscanf(src, FMT_ASSIGN3(type_fmt), &vals[0], &vals[1], &vals[2]);
\
+ bu_ret = sscanf(src, FMT_ASSIGN3(type_fmt), &vals[0], &vals[1],
&vals[2]); \
+ checkReturnVal("sscanf", ret, expected_err); \
+ checkReturnsEqual(ret, bu_ret); \
+ for (i = 0; i < 3; ++i) { \
+ if (vals[i] != type_init) { \
+ bu_exit(1, "\t[FAIL] No assignment expected, but vals[%d] " \
+ "changed from %" CPP_STR(type_fmt) " to %"
CPP_STR(type_fmt) ".\n", \
+ i, type_init, vals[i]); \
+ } \
} \
- } \
-}
+ }
/* Attempt to read 2 values and assign 1 value from src.
* If src includes 2 valid and 1 invalid input value, should return 0 to
@@ -687,34 +687,34 @@
* indicate input failure.
*/
#define TEST_FAILURE_2(type, type_fmt, type_init, src, expected_err) \
-{ \
- type val = type_init; \
- print_src_and_fmt(src, FMT_READ2_ASSIGN1(type_fmt)); \
- ret = sscanf(src, FMT_READ2_ASSIGN1(type_fmt), &val); \
- bu_ret = sscanf(src, FMT_READ2_ASSIGN1(type_fmt), &val); \
- checkReturnVal("sscanf", ret, expected_err); \
- checkReturnsEqual(ret, bu_ret); \
- if (val != type_init) { \
- bu_exit(1, "\t[FAIL] No assignment expected, but val " \
- "changed from %" CPP_STR(type_fmt) " to %" CPP_STR(type_fmt)
".\n", \
- type_init, val); \
- } \
-}
+ { \
+ type val = type_init; \
+ print_src_and_fmt(src, FMT_READ2_ASSIGN1(type_fmt)); \
+ ret = sscanf(src, FMT_READ2_ASSIGN1(type_fmt), &val); \
+ bu_ret = sscanf(src, FMT_READ2_ASSIGN1(type_fmt), &val); \
+ checkReturnVal("sscanf", ret, expected_err); \
+ checkReturnsEqual(ret, bu_ret); \
+ if (val != type_init) { \
+ bu_exit(1, "\t[FAIL] No assignment expected, but val " \
+ "changed from %" CPP_STR(type_fmt) " to %"
CPP_STR(type_fmt) ".\n", \
+ type_init, val); \
+ } \
+ }
#define EXPECT_MATCH_FAILURE 0
#define EXPECT_INPUT_FAILURE EOF
- TEST_FAILURE_1(int, d, 0, "xx 34 56", EXPECT_MATCH_FAILURE);
- TEST_FAILURE_2(int, d, 0, "12 34 xx", EXPECT_MATCH_FAILURE);
- TEST_FAILURE_2(int, d, 0, "12 34", EXPECT_INPUT_FAILURE);
- TEST_FAILURE_1(int, d, 0, "", EXPECT_INPUT_FAILURE);
+TEST_FAILURE_1(int, d, 0, "xx 34 56", EXPECT_MATCH_FAILURE);
+TEST_FAILURE_2(int, d, 0, "12 34 xx", EXPECT_MATCH_FAILURE);
+TEST_FAILURE_2(int, d, 0, "12 34", EXPECT_INPUT_FAILURE);
+TEST_FAILURE_1(int, d, 0, "", EXPECT_INPUT_FAILURE);
- // TODO - what is the intent here? The 1[123] input seems to be causing
problems
+// TODO - what is the intent here? The 1[123] input seems to be causing
problems
#if 0
- TEST_FAILURE_1(char, 1[123], 'a', "x 2 3", EXPECT_MATCH_FAILURE);
- TEST_FAILURE_2(char, 1[123], 'a', "1 2 x", EXPECT_MATCH_FAILURE);
- TEST_FAILURE_2(char, 1[123], 'a', "1 2", EXPECT_INPUT_FAILURE);
- TEST_FAILURE_1(char, 1[123], 'a', "", EXPECT_INPUT_FAILURE);
+TEST_FAILURE_1(char, 1[123], 'a', "x 2 3", EXPECT_MATCH_FAILURE);
+TEST_FAILURE_2(char, 1[123], 'a', "1 2 x", EXPECT_MATCH_FAILURE);
+TEST_FAILURE_2(char, 1[123], 'a', "1 2", EXPECT_INPUT_FAILURE);
+TEST_FAILURE_1(char, 1[123], 'a', "", EXPECT_INPUT_FAILURE);
#endif
}
Modified: brlcad/trunk/src/libbu/tests/str_isprint.c
===================================================================
--- brlcad/trunk/src/libbu/tests/str_isprint.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/str_isprint.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -52,8 +52,8 @@
int test_num = 0;
if (argc < 2) {
- fprintf(stderr, "Usage: %s {test_num}\n", argv[0]);
- return 1;
+ fprintf(stderr, "Usage: %s {test_num}\n", argv[0]);
+ return 1;
}
sscanf(argv[1], "%d", &test_num);
Modified: brlcad/trunk/src/libbu/tests/vls_vprintf.c
===================================================================
--- brlcad/trunk/src/libbu/tests/vls_vprintf.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/tests/vls_vprintf.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -97,39 +97,39 @@
int
check_format_chars(void)
{
- int status = BRLCAD_OK; /* assume okay */
- int i, cflags;
- vflags_t f;
+ int status = BRLCAD_OK; /* assume okay */
+ int i, cflags;
+ vflags_t f;
- for (i = 0; i < 255; ++i) {
- unsigned char c = (unsigned char)i;
- if (!isprint(c))
- continue;
- cflags = format_part_status(c);
- if (cflags & VP_VALID) {
- /* we need a valid part handler */
- int vp_part = cflags & VP_PARTS;
+ for (i = 0; i < 255; ++i) {
+ unsigned char c = (unsigned char)i;
+ if (!isprint(c))
+ continue;
+ cflags = format_part_status(c);
+ if (cflags & VP_VALID) {
+ /* we need a valid part handler */
+ int vp_part = cflags & VP_PARTS;
- /* for the moment we only have one such handler */
- if (vp_part ^ VP_LENGTH_MOD) /* same as !(vp_part & VP_LENGTH_MOD) */
- continue;
+ /* for the moment we only have one such handler */
+ if (vp_part ^ VP_LENGTH_MOD) /* same as !(vp_part & VP_LENGTH_MOD)
*/
+ continue;
- if (!handle_format_part(vp_part, &f, c, VP_NOPRINT)) {
- /* tell user */
- printf("Unhandled valid char '%c'
[FAIL]\n", c);
- status = BRLCAD_ERROR;
- }
- } else if (cflags & VP_OBSOLETE) {
- /* we need an obsolete part handler */
- if (!handle_obsolete_format_char(c, VP_NOPRINT)) {
- /* tell user */
- printf("Unhandled obsolete char '%c'
[FAIL]\n", c);
- status = BRLCAD_ERROR;
- }
+ if (!handle_format_part(vp_part, &f, c, VP_NOPRINT)) {
+ /* tell user */
+ printf("Unhandled valid char '%c'
[FAIL]\n", c);
+ status = BRLCAD_ERROR;
+ }
+ } else if (cflags & VP_OBSOLETE) {
+ /* we need an obsolete part handler */
+ if (!handle_obsolete_format_char(c, VP_NOPRINT)) {
+ /* tell user */
+ printf("Unhandled obsolete char '%c'
[FAIL]\n", c);
+ status = BRLCAD_ERROR;
+ }
+ }
}
- }
- return status;
+ return status;
}
@@ -181,12 +181,12 @@
return vls_vs_sys("%p", (void *)argv);
case 15:
return vls_vs_sys("%%%d%%", argc);
- /* various lengths */
+ /* various lengths */
case 16:
return vls_vs_string("123 -123", "%zu %zd", (size_t)123,
(ssize_t)-123);
case 17:
return vls_vs_string("123 -123", "%jd %td", (intmax_t)123,
(ptrdiff_t)-123);
- /* various widths */
+ /* various widths */
case 18:
return vls_vs_sys("he%*so", 2, "ll");
case 19:
@@ -193,7 +193,7 @@
return vls_vs_sys("he%*so", 2, "llll");
case 20:
return vls_vs_sys("he%*so", 4, "ll");
- /* various precisions */
+ /* various precisions */
case 21:
return vls_vs_sys("he%.*so", 2, "ll");
case 22:
@@ -200,7 +200,7 @@
return vls_vs_sys("he%.-1-o", 123);
case 23:
return vls_vs_sys("%6.-3f", 123);
- /* various flags */
+ /* various flags */
case 24:
return vls_vs_sys("%010d", 123);
case 25:
@@ -207,7 +207,7 @@
return vls_vs_sys("%#-.10lx", 123);
case 26:
return vls_vs_sys("%#lf", 123.0);
- /* two-character length modifiers */
+ /* two-character length modifiers */
case 27:
return vls_vs_sys("he%10dllo", 123);
case 28:
@@ -222,8 +222,8 @@
return vls_vs_sys("he%.-10ullo", 123);
case 33:
return vls_vs_sys("%hd %hhd", 123, -123);
- /* combinations, e.g., bug ID 3475562, fixed at rev 48958 */
- /* left justify, right justify, in wider fields than the strings */
+ /* combinations, e.g., bug ID 3475562, fixed at rev 48958 */
+ /* left justify, right justify, in wider fields than the strings */
case 34:
f = p = 2;
return vls_vs_sys("|%-*.*s|%*.*s|", f, p, "t", f, p, "t");
@@ -233,7 +233,7 @@
case 36:
f = p = 2;
return vls_vs_sys("|%*s|%-*s|", f, word, f, word);
- /* min field width; max string length ('precision'); string */
+ /* min field width; max string length ('precision'); string */
case 37:
f = 2; p = 4;
printf("fw=%d, prec=%d, '%s': '%%%d.%ds'\n", f, p, word, f, p);
@@ -259,7 +259,7 @@
f = 8; p = 0;
printf("fw=%d, '%s': '%%%ds'\n", f, word, f);
return vls_vs_sys("%*s", f, word);
- /* same but left justify */
+ /* same but left justify */
case 43:
f = 2; p = 4;
printf("fw=%d, prec=%d, '%s': '%%-%d.%ds'\n", f, p, word, f, p);
@@ -280,24 +280,24 @@
f = 8; p = 0;
printf("fw=%d, prec=%d, '%s': '%%-%d.%ds'\n", f, p, word, f, p);
return vls_vs_sys("%-*.*s", f, p, word);
- /* from "various types" */
+ /* from "various types" */
case 48:
return vls_vs_sys("%f %F", 1.23, -3.21);
- /* from "two-character length modifiers" */
+ /* from "two-character length modifiers" */
case 49:
return vls_vs_sys("%ld %lld", 123, -123LL);
- /* unsigned variant */
+ /* unsigned variant */
case 50:
return vls_vs_sys("%lu %llu", 123, 123ULL);
- /* from "two-character length modifiers" */
+ /* from "two-character length modifiers" */
case 51:
return vls_vs_sys("%ld %lld", 123, -123);
- /* unsigned variant */
+ /* unsigned variant */
case 52:
return vls_vs_sys("%lu %llu", 123, 123);
case 53:
return vls_vs_sys("%hd %hhd", 123, -123);
- /* misc */
+ /* misc */
case 54:
return vls_vs_sys("% d % d", 123, -123);
case 55:
@@ -327,40 +327,40 @@
case 67:
return vls_vs_sys("%.030s",
"1234567890123456789012345678901234567890");
- /* this test needs a relook
- return vls_vs_sys("%H", 123);
- */
+ /* this test needs a relook
+ return vls_vs_sys("%H", 123);
+ */
- /* obsolete but usable */
- /*
- vls_vs_sys("%S", (wchar_t *)"hello");
- vls_vs_sys("%qd %qd", 123, -123);
- */
+ /* obsolete but usable */
+ /*
+ vls_vs_sys("%S", (wchar_t *)"hello");
+ vls_vs_sys("%qd %qd", 123, -123);
+ */
- /* EXPECTED FAILURES (don't use in production code):
- *
- * Notes:
- *
- * 1. For these tests have the return value increment 'expfails'.
- * 2. Test with both 'make vsl-regress' and 'make regress' because
- * some other tests use this function in unpredictable ways.
- * 3. After a test is fixed, change the return value to increment
- * 'fails', move it to the EXPECTED PASS group above, and add
- * some info about it as necessary to help those who may be
- * forced to revisit this.
- *
- */
+ /* EXPECTED FAILURES (don't use in production code):
+ *
+ * Notes:
+ *
+ * 1. For these tests have the return value increment 'expfails'.
+ * 2. Test with both 'make vsl-regress' and 'make regress' because
+ * some other tests use this function in unpredictable ways.
+ * 3. After a test is fixed, change the return value to increment
+ * 'fails', move it to the EXPECTED PASS group above, and add
+ * some info about it as necessary to help those who may be
+ * forced to revisit this.
+ *
+ */
- /* obsolete - expected failures
- case 10000:
- return !vls_vs_sys("%C", 'N');
- case 10001:
- return !vls_vs_sys("%D %D", 123, -123);
- case 10002:
- return !vls_vs_sys("%O %O", 123, -123);
- case 10003:
- return !vls_vs_sys("%U %U", 123, -123);a
- */
+ /* obsolete - expected failures
+ case 10000:
+ return !vls_vs_sys("%C", 'N');
+ case 10001:
+ return !vls_vs_sys("%D %D", 123, -123);
+ case 10002:
+ return !vls_vs_sys("%O %O", 123, -123);
+ case 10003:
+ return !vls_vs_sys("%U %U", 123, -123);a
+ */
}
return BRLCAD_ERROR;
Modified: brlcad/trunk/src/libbu/thread.cpp
===================================================================
--- brlcad/trunk/src/libbu/thread.cpp 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/thread.cpp 2019-05-20 02:08:41 UTC (rev 73089)
@@ -107,18 +107,18 @@
extern "C" {
-void
-thread_set_cpu(int cpu)
-{
- thread_cpu = cpu;
-}
+ void
+ thread_set_cpu(int cpu)
+ {
+ thread_cpu = cpu;
+ }
-int
-thread_get_cpu(void)
-{
- return thread_cpu;
-}
+ int
+ thread_get_cpu(void)
+ {
+ return thread_cpu;
+ }
} /* extern "C" */
Modified: brlcad/trunk/src/libbu/units_humanize.c
===================================================================
--- brlcad/trunk/src/libbu/units_humanize.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/units_humanize.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -77,7 +77,7 @@
if (buf == NULL || suffix == NULL)
return (-1);
else if (scale >= hn_maxscale &&
- ((scale & ~(BU_HN_AUTOSCALE|BU_HN_GETSCALE)) != 0))
+ ((scale & ~(BU_HN_AUTOSCALE|BU_HN_GETSCALE)) != 0))
return (-1);
if ((flags & BU_HN_DIVISOR_1000) && (flags & BU_HN_IEC_PREFIXES))
return (-1);
@@ -154,8 +154,8 @@
* divide once more.
*/
for (i = 0;
- (quotient >= max || (quotient == max - 1 &&
- leftover >= divisordeccut)) && i <
hn_maxscale; i++) {
+ (quotient >= max || (quotient == max - 1 &&
+ leftover >= divisordeccut)) && i <
hn_maxscale; i++) {
leftover = quotient % divisor;
quotient /= divisor;
}
Modified: brlcad/trunk/src/libbu/vls.c
===================================================================
--- brlcad/trunk/src/libbu/vls.c 2019-05-20 02:07:09 UTC (rev 73088)
+++ brlcad/trunk/src/libbu/vls.c 2019-05-20 02:08:41 UTC (rev 73089)
@@ -214,7 +214,7 @@
vp->vls_offset = 0;
if (vp->vls_str)
- vp->vls_str[len+vp->vls_offset] = '\0'; /* force null
termination */
+ vp->vls_str[len+vp->vls_offset] = '\0'; /* force null termination */
vp->vls_len = len;
}
@@ -914,7 +914,7 @@
int i = 0;
long ret = 0;
/*char bsep = '\0';
- char esep = '\0';*/
+ char esep = '\0';*/
long vals[4] = {0}; /* 0 = width, 1 = min/init, 2 = max, 3 = increment */
long state_val = 0;
const char *wstr = inc_specifier;
Modified: brlcad/trunk/src/libbu/vls_vprintf.c
===================================================================
--- brlcad/trunk/src/libbu/vls_vprintf.c 2019-05-20 02:07:09 UTC (rev
73088)
+++ brlcad/trunk/src/libbu/vls_vprintf.c 2019-05-20 02:08:41 UTC (rev
73089)
@@ -83,86 +83,86 @@
int
format_part_status(const char c)
{
- int status = VP_VALID; /* assume valid */
+ int status = VP_VALID; /* assume valid */
- /* return a bit flag with: type, validity */
- switch (c) {
- /* VALID ===================================== */
- case 'd':
- case 'i':
- case 'o':
- case 'u':
- case 'x':
- case 'X':
- case 'e':
- case 'E':
- case 'f':
- case 'F':
- case 'g':
- case 'G':
- case 'a':
- case 'A':
- case 'c':
- case 's':
- case 'p':
- case 'n':
- case '%':
- case 'V': /* bu_vls extension */
- status |= VP_CONVERSION_SPEC;
- break;
+ /* return a bit flag with: type, validity */
+ switch (c) {
+ /* VALID ===================================== */
+ case 'd':
+ case 'i':
+ case 'o':
+ case 'u':
+ case 'x':
+ case 'X':
+ case 'e':
+ case 'E':
+ case 'f':
+ case 'F':
+ case 'g':
+ case 'G':
+ case 'a':
+ case 'A':
+ case 'c':
+ case 's':
+ case 'p':
+ case 'n':
+ case '%':
+ case 'V': /* bu_vls extension */
+ status |= VP_CONVERSION_SPEC;
+ break;
- case 'h': /* can be doubled: 'hh' */
- case 'l': /* can be doubled: 'll' */
- case 'L':
- case 'j':
- case 'z':
- case 't':
- status |= VP_LENGTH_MOD;
- break;
+ case 'h': /* can be doubled: 'hh' */
+ case 'l': /* can be doubled: 'll' */
+ case 'L':
+ case 'j':
+ case 'z':
+ case 't':
+ status |= VP_LENGTH_MOD;
+ break;
- case '#':
- case '0':
- case '-':
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
