Revision: 77697
http://sourceforge.net/p/brlcad/code/77697
Author: brlcad
Date: 2020-11-06 06:05:16 +0000 (Fri, 06 Nov 2020)
Log Message:
-----------
consistent braces and make sure we don't try to strlen a null
Modified Paths:
--------------
brlcad/trunk/src/librt/search.c
Modified: brlcad/trunk/src/librt/search.c
===================================================================
--- brlcad/trunk/src/librt/search.c 2020-11-05 16:09:52 UTC (rev 77696)
+++ brlcad/trunk/src/librt/search.c 2020-11-06 06:05:16 UTC (rev 77697)
@@ -152,8 +152,7 @@
*/
HIDDEN void
db_fullpath_list_subtree(struct db_full_path *path, int curr_bool, union tree
*tp,
- void (*traverse_func) (struct db_full_path *path,
- void *),
+ void (*traverse_func) (struct db_full_path *path, void
*),
void *client_data)
{
struct directory *dp;
@@ -228,8 +227,7 @@
* processing and filtering by the search routines.
*/
HIDDEN void
-db_fullpath_list(struct db_full_path *path,
- void *client_data)
+db_fullpath_list(struct db_full_path *path, void *client_data)
{
struct directory *dp;
struct list_client_data_t *lcd= (struct list_client_data_t *)client_data;
@@ -338,7 +336,8 @@
HIDDEN int
-find_execute_nested_plans(struct db_i *dbip, struct bu_ptbl *results, struct
db_node_t *db_node, struct db_plan_t *plan) {
+find_execute_nested_plans(struct db_i *dbip, struct bu_ptbl *results, struct
db_node_t *db_node, struct db_plan_t *plan)
+{
struct db_plan_t *p = NULL;
int state = 0;
for (p = plan; p && (state = (p->eval)(p, db_node, dbip, results)); p =
p->next)
@@ -526,7 +525,6 @@
int ret = 0;
dp = DB_FULL_PATH_CUR_DIR(db_node->path);
-
if (!dp) {
db_node->matched_filters = 0;
return 0;
@@ -619,7 +617,8 @@
HIDDEN int
-string_to_name_and_val(const char *in, struct bu_vls *name, struct bu_vls
*value) {
+string_to_name_and_val(const char *in, struct bu_vls *name, struct bu_vls
*value)
+{
size_t equalpos = 0;
int checkval = 0;
@@ -1204,7 +1203,8 @@
struct bu_vls value = BU_VLS_INIT_ZERO;
dp = DB_FULL_PATH_CUR_DIR(db_node->path);
- if (!dp) return 0;
+ if (!dp)
+ return 0;
/* Check for unescaped >, < or = characters. If present, the
* attribute must not only be present but the value assigned to
@@ -1440,10 +1440,12 @@
{
/* TODO make this faster by storing the individual "subholes" so they
don't have to be recalculated */
int ret, hole_i, char_i, plain_begin, plain_len;
+ char **filleds = NULL;
char **originals = NULL;
- char **filleds = NULL;
char *name;
- size_t name_len, filled_len, old_filled_len;
+ size_t filled_len = 0;
+ size_t name_len = 0;
+ size_t old_filled_len = 0;
if (0 < plan->p_un.ex._e_nholes) {
originals = (char **)bu_calloc(plan->p_un.ex._e_nholes, sizeof(char *),
"f_exec originals");
@@ -1459,7 +1461,8 @@
} else {
name = db_path_to_string(db_node->path);
}
- name_len = strlen(name);
+ if (name)
+ name_len = strlen(name);
for (hole_i=0; hole_i<plan->p_un.ex._e_nholes; hole_i++) {
plain_begin = 0;
@@ -2398,7 +2401,8 @@
HIDDEN void
-find_execute_plans(struct db_i *dbip, struct bu_ptbl *results, struct
db_node_t *db_node, struct db_plan_t *plan) {
+find_execute_plans(struct db_i *dbip, struct bu_ptbl *results, struct
db_node_t *db_node, struct db_plan_t *plan)
+{
struct db_plan_t *p;
for (p = plan; p && (p->eval)(p, db_node, dbip, results); p = p->next)
;
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
