Revision: 76630
http://sourceforge.net/p/brlcad/code/76630
Author: brlcad
Date: 2020-08-01 06:59:18 +0000 (Sat, 01 Aug 2020)
Log Message:
-----------
rename function typedefs with func_t convention
and update names to pair 'destroy' with 'create' and have same naming
style. propagate accordingly to the minimum call sites affected. no
logic change are intentionally introduced.
Modified Paths:
--------------
brlcad/branches/bioh/include/ged/defines.h
brlcad/branches/bioh/include/tclcad.h
brlcad/branches/bioh/src/libged/display_list.c
brlcad/branches/bioh/src/libged/ged.c
brlcad/branches/bioh/src/libged/ged_private.h
brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
brlcad/branches/bioh/src/mged/chgview.c
brlcad/branches/bioh/src/mged/mged.c
Modified: brlcad/branches/bioh/include/ged/defines.h
===================================================================
--- brlcad/branches/bioh/include/ged/defines.h 2020-08-01 06:55:05 UTC (rev
76629)
+++ brlcad/branches/bioh/include/ged/defines.h 2020-08-01 06:59:18 UTC (rev
76630)
@@ -84,11 +84,11 @@
#define GED_FUNC_PTR_NULL ((ged_func_ptr)0)
/* Callback related definitions */
-typedef void (*ged_io_handler_callback_t)(void *, int);
-typedef void (*ged_refresh_callback_ptr)(void *);
-typedef void (*ged_create_vlist_solid_callback_ptr)(struct solid *);
-typedef void (*ged_create_vlist_callback_ptr)(struct display_list *);
-typedef void (*ged_free_vlist_callback_ptr)(unsigned int, int);
+typedef void (*ged_io_func_t)(void *, int);
+typedef void (*ged_refresh_func_t)(void *);
+typedef void (*ged_create_vlist_solid_func_t)(struct solid *);
+typedef void (*ged_create_vlist_display_list_func_t)(struct display_list *);
+typedef void (*ged_destroy_vlist_func_t)(unsigned int, int);
struct ged_callback_state;
/**
@@ -246,8 +246,8 @@
void *ged_refresh_clientdata; /**< @brief
client data passed to refresh handler */
void (*ged_output_handler)(struct ged *, char *);
/**< @brief function for handling output */
void (*ged_create_vlist_solid_callback)(struct solid
*); /**< @brief function to call after creating a vlist to create display
list for solid */
- void (*ged_create_vlist_callback)(struct
display_list *); /**< @brief function to call after all vlist created that
loops through creating display list for each solid */
- void (*ged_free_vlist_callback)(unsigned int, int);
/**< @brief function to call after freeing a vlist */
+ void
(*ged_create_vlist_display_list_callback)(struct display_list *); /**<
@brief function to call after all vlist created that loops through creating
display list for each solid */
+ void (*ged_destroy_vlist_callback)(unsigned int,
int); /**< @brief function to call after freeing a vlist */
/* Handler functions for I/O communication with asynchronous subprocess
commands. There
* are two opaque data structures at play here, with different scopes.
One is the "data"
@@ -261,7 +261,7 @@
* can't know about as it is application specific) lives. It should be
assigned in the
* applications gedp before any calls to ged_create_io_handler are made.
* */
- void (*ged_create_io_handler)(struct ged_subprocess *gp, int fd,
ged_io_handler_callback_t callback, void *data);
+ void (*ged_create_io_handler)(struct ged_subprocess *gp, int fd,
ged_io_func_t callback, void *data);
void (*ged_delete_io_handler)(struct ged_subprocess *gp, int fd);
void *ged_io_data; /**< brief caller supplied data */
Modified: brlcad/branches/bioh/include/tclcad.h
===================================================================
--- brlcad/branches/bioh/include/tclcad.h 2020-08-01 06:55:05 UTC (rev
76629)
+++ brlcad/branches/bioh/include/tclcad.h 2020-08-01 06:59:18 UTC (rev
76630)
@@ -522,7 +522,7 @@
int io_mode;
};
TCLCAD_EXPORT void
-tclcad_create_io_handler(struct ged_subprocess *p, int fd,
ged_io_handler_callback_t callback, void *data);
+tclcad_create_io_handler(struct ged_subprocess *p, int fd, ged_io_func_t
callback, void *data);
TCLCAD_EXPORT void
tclcad_delete_io_handler(struct ged_subprocess *p, int fd);
Modified: brlcad/branches/bioh/src/libged/display_list.c
===================================================================
--- brlcad/branches/bioh/src/libged/display_list.c 2020-08-01 06:55:05 UTC
(rev 76629)
+++ brlcad/branches/bioh/src/libged/display_list.c 2020-08-01 06:59:18 UTC
(rev 76630)
@@ -228,11 +228,11 @@
next_gdlp = BU_LIST_PNEXT(display_list, gdlp);
if (BU_STR_EQUAL(path, bu_vls_addr(&gdlp->dl_path))) {
- if (gedp->ged_free_vlist_callback !=
GED_FREE_VLIST_CALLBACK_PTR_NULL) {
+ if (gedp->ged_destroy_vlist_callback !=
GED_DESTROY_VLIST_FUNC_NULL) {
/* We can't assume the display lists are contiguous */
FOR_ALL_SOLIDS(sp, &gdlp->dl_headSolid) {
- ged_free_vlist_cb(gedp, BU_LIST_FIRST(solid,
&gdlp->dl_headSolid)->s_dlist, 1);
+ ged_destroy_vlist_cb(gedp, BU_LIST_FIRST(solid,
&gdlp->dl_headSolid)->s_dlist, 1);
}
}
@@ -264,7 +264,7 @@
nsp = BU_LIST_PNEXT(solid, sp);
if (db_full_path_match_top(&subpath, &sp->s_fullpath)) {
- ged_free_vlist_cb(gedp, sp->s_dlist, 1);
+ ged_destroy_vlist_cb(gedp, sp->s_dlist, 1);
BU_LIST_DEQUEUE(&sp->l);
FREE_SOLID(sp, &freesolid->l);
@@ -315,7 +315,7 @@
while (BU_LIST_NOT_HEAD(sp, &gdlp->dl_headSolid)) {
nsp = BU_LIST_PNEXT(solid, sp);
if (db_full_path_subset(&sp->s_fullpath, subpath, skip_first)) {
- ged_free_vlist_cb(gedp, sp->s_dlist, 1);
+ ged_destroy_vlist_cb(gedp, sp->s_dlist, 1);
BU_LIST_DEQUEUE(&sp->l);
FREE_SOLID(sp, &freesolid->l);
}
@@ -408,7 +408,7 @@
int ret;
int full_len = sp->s_fullpath.fp_len;
- ged_free_vlist_cb(gedp, sp->s_dlist, 1);
+ ged_destroy_vlist_cb(gedp, sp->s_dlist, 1);
sp->s_fullpath.fp_len = full_len - 1;
db_dup_full_path(&dup_path, &sp->s_fullpath);
@@ -495,11 +495,11 @@
struct solid *sp;
struct directory *dp;
- if (gedp->ged_free_vlist_callback != GED_FREE_VLIST_CALLBACK_PTR_NULL) {
+ if (gedp->ged_destroy_vlist_callback != GED_DESTROY_VLIST_FUNC_NULL) {
/* We can't assume the display lists are contiguous */
FOR_ALL_SOLIDS(sp, &gdlp->dl_headSolid) {
- ged_free_vlist_cb(gedp, BU_LIST_FIRST(solid,
&gdlp->dl_headSolid)->s_dlist, 1);
+ ged_destroy_vlist_cb(gedp, BU_LIST_FIRST(solid,
&gdlp->dl_headSolid)->s_dlist, 1);
}
}
@@ -939,7 +939,7 @@
ret += redraw_solid(sp, dbip, tsp, gvp);
}
}
- ged_create_vlist_cb(gedp, gdlp);
+ ged_create_vlist_display_list_cb(gedp, gdlp);
return ret;
}
@@ -1289,7 +1289,7 @@
while (BU_LIST_WHILE(gdlp, display_list, hdlp)) {
if (BU_LIST_NON_EMPTY(&gdlp->dl_headSolid))
- ged_free_vlist_cb(gedp, BU_LIST_FIRST(solid,
&gdlp->dl_headSolid)->s_dlist,
+ ged_destroy_vlist_cb(gedp, BU_LIST_FIRST(solid,
&gdlp->dl_headSolid)->s_dlist,
BU_LIST_LAST(solid, &gdlp->dl_headSolid)->s_dlist -
BU_LIST_FIRST(solid, &gdlp->dl_headSolid)->s_dlist + 1);
@@ -2480,7 +2480,7 @@
}
- ged_create_vlist_cb(gedp, gdlp);
+ ged_create_vlist_display_list_cb(gedp, gdlp);
gdlp = next_gdlp;
}
Modified: brlcad/branches/bioh/src/libged/ged.c
===================================================================
--- brlcad/branches/bioh/src/libged/ged.c 2020-08-01 06:55:05 UTC (rev
76629)
+++ brlcad/branches/bioh/src/libged/ged.c 2020-08-01 06:59:18 UTC (rev
76630)
@@ -269,8 +269,8 @@
gedp->ged_refresh_clientdata = NULL;
gedp->ged_output_handler = NULL;
gedp->ged_create_vlist_solid_callback = NULL;
- gedp->ged_create_vlist_callback = NULL;
- gedp->ged_free_vlist_callback = NULL;
+ gedp->ged_create_vlist_display_list_callback = NULL;
+ gedp->ged_destroy_vlist_callback = NULL;
gedp->ged_create_io_handler = NULL;
gedp->ged_delete_io_handler = NULL;
gedp->ged_io_data = NULL;
@@ -699,7 +699,7 @@
void
ged_refresh_cb(struct ged *gedp)
{
- if (gedp->ged_refresh_handler != GED_REFRESH_CALLBACK_PTR_NULL) {
+ if (gedp->ged_refresh_handler != GED_REFRESH_FUNC_NULL) {
gedp->ged_cbs->ged_refresh_handler_cnt++;
if (gedp->ged_cbs->ged_refresh_handler_cnt > 1) {
bu_log("Warning - recursive call of gedp->ged_refresh_handler!\n");
@@ -725,7 +725,7 @@
void
ged_create_vlist_solid_cb(struct ged *gedp, struct solid *s)
{
- if (gedp->ged_create_vlist_solid_callback !=
GED_CREATE_VLIST_SOLID_CALLBACK_PTR_NULL) {
+ if (gedp->ged_create_vlist_solid_callback !=
GED_CREATE_VLIST_SOLID_FUNC_NULL) {
gedp->ged_cbs->ged_create_vlist_solid_callback_cnt++;
if (gedp->ged_cbs->ged_create_vlist_solid_callback_cnt > 1) {
bu_log("Warning - recursive call of
gedp->ged_create_vlist_solid_callback!\n");
@@ -736,28 +736,28 @@
}
void
-ged_create_vlist_cb(struct ged *gedp, struct display_list *dl)
+ged_create_vlist_display_list_cb(struct ged *gedp, struct display_list *dl)
{
- if (gedp->ged_create_vlist_callback != GED_CREATE_VLIST_CALLBACK_PTR_NULL)
{
- gedp->ged_cbs->ged_create_vlist_callback_cnt++;
- if (gedp->ged_cbs->ged_create_vlist_callback_cnt > 1) {
+ if (gedp->ged_create_vlist_display_list_callback !=
GED_CREATE_VLIST_DISPLAY_LIST_FUNC_NULL) {
+ gedp->ged_cbs->ged_create_vlist_display_list_callback_cnt++;
+ if (gedp->ged_cbs->ged_create_vlist_display_list_callback_cnt > 1) {
bu_log("Warning - recursive call of
gedp->ged_create_vlist_callback!\n");
}
- (*gedp->ged_create_vlist_callback)(dl);
- gedp->ged_cbs->ged_create_vlist_callback_cnt--;
+ (*gedp->ged_create_vlist_display_list_callback)(dl);
+ gedp->ged_cbs->ged_create_vlist_display_list_callback_cnt--;
}
}
void
-ged_free_vlist_cb(struct ged *gedp, unsigned int i, int j)
+ged_destroy_vlist_cb(struct ged *gedp, unsigned int i, int j)
{
- if (gedp->ged_free_vlist_callback != GED_FREE_VLIST_CALLBACK_PTR_NULL) {
- gedp->ged_cbs->ged_free_vlist_callback_cnt++;
- if (gedp->ged_cbs->ged_free_vlist_callback_cnt > 1) {
- bu_log("Warning - recursive call of
gedp->ged_free_vlist_callback!\n");
+ if (gedp->ged_destroy_vlist_callback != GED_DESTROY_VLIST_FUNC_NULL) {
+ gedp->ged_cbs->ged_destroy_vlist_callback_cnt++;
+ if (gedp->ged_cbs->ged_destroy_vlist_callback_cnt > 1) {
+ bu_log("Warning - recursive call of
gedp->ged_destroy_vlist_callback!\n");
}
- (*gedp->ged_free_vlist_callback)(i, j);
- gedp->ged_cbs->ged_free_vlist_callback_cnt--;
+ (*gedp->ged_destroy_vlist_callback)(i, j);
+ gedp->ged_cbs->ged_destroy_vlist_callback_cnt--;
}
}
Modified: brlcad/branches/bioh/src/libged/ged_private.h
===================================================================
--- brlcad/branches/bioh/src/libged/ged_private.h 2020-08-01 06:55:05 UTC
(rev 76629)
+++ brlcad/branches/bioh/src/libged/ged_private.h 2020-08-01 06:59:18 UTC
(rev 76630)
@@ -83,12 +83,11 @@
#define GED_TERMINAL_WIDTH 80
-
/* Callback management related structures */
-#define GED_REFRESH_CALLBACK_PTR_NULL ((ged_refresh_callback_ptr)0)
-#define GED_CREATE_VLIST_SOLID_CALLBACK_PTR_NULL
((ged_create_vlist_solid_callback_ptr)0)
-#define GED_CREATE_VLIST_CALLBACK_PTR_NULL ((ged_create_vlist_callback_ptr)0)
-#define GED_FREE_VLIST_CALLBACK_PTR_NULL ((ged_free_vlist_callback_ptr)0)
+#define GED_REFRESH_FUNC_NULL ((ged_refresh_func_t)0)
+#define GED_CREATE_VLIST_SOLID_FUNC_NULL ((ged_create_vlist_solid_func_t)0)
+#define GED_CREATE_VLIST_DISPLAY_LIST_FUNC_NULL
((ged_create_vlist_display_list_func_t)0)
+#define GED_DESTROY_VLIST_FUNC_NULL ((ged_destroy_vlist_func_t)0)
// Private bookkeeping structure used by callback handlers
struct ged_callback_state {
@@ -95,8 +94,8 @@
int ged_refresh_handler_cnt;
int ged_output_handler_cnt;
int ged_create_vlist_solid_callback_cnt;
- int ged_create_vlist_callback_cnt;
- int ged_free_vlist_callback_cnt;
+ int ged_create_vlist_display_list_callback_cnt;
+ int ged_destroy_vlist_callback_cnt;
int ged_io_handler_callback_cnt;
};
@@ -107,8 +106,8 @@
GED_EXPORT extern void ged_refresh_cb(struct ged *);
GED_EXPORT extern void ged_output_handler_cb(struct ged *, char *);
GED_EXPORT extern void ged_create_vlist_solid_cb(struct ged *, struct solid *);
-GED_EXPORT extern void ged_create_vlist_cb(struct ged *, struct display_list
*);
-GED_EXPORT extern void ged_free_vlist_cb(struct ged *, unsigned int, int);
+GED_EXPORT extern void ged_create_vlist_display_list_cb(struct ged *, struct
display_list *);
+GED_EXPORT extern void ged_destroy_vlist_cb(struct ged *, unsigned int, int);
GED_EXPORT extern void ged_io_handler_cb(struct ged *, void *, int);
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-08-01 06:55:05 UTC
(rev 76629)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-08-01 06:59:18 UTC
(rev 76630)
@@ -531,7 +531,7 @@
HIDDEN void to_create_vlist_callback_solid(struct solid *gdlp);
HIDDEN void to_create_vlist_callback(struct display_list *gdlp);
-HIDDEN void to_free_vlist_callback(unsigned int dlist, int range);
+HIDDEN void to_destroy_vlist_callback(unsigned int dlist, int range);
HIDDEN void to_rt_end_callback_internal(int aborted);
HIDDEN void to_output_handler(struct ged *gedp, char *line);
@@ -1180,7 +1180,7 @@
/* Wrappers for setting up/tearing down IO handler */
#ifndef _WIN32
void
-tclcad_create_io_handler(struct ged_subprocess *p, int fd,
ged_io_handler_callback_t callback, void *data)
+tclcad_create_io_handler(struct ged_subprocess *p, int fd, ged_io_func_t
callback, void *data)
{
if (!p || !p->p || !p->gedp || !p->gedp->ged_io_data) return;
int *fdp = (int *)bu_process_fd(p->p, fd);
@@ -1314,8 +1314,8 @@
top->to_gedp->ged_output_handler = to_output_handler;
top->to_gedp->ged_refresh_handler = to_refresh_handler;
top->to_gedp->ged_create_vlist_solid_callback =
to_create_vlist_callback_solid;
- top->to_gedp->ged_create_vlist_callback = to_create_vlist_callback;
- top->to_gedp->ged_free_vlist_callback = to_free_vlist_callback;
+ top->to_gedp->ged_create_vlist_display_list_callback =
to_create_vlist_callback;
+ top->to_gedp->ged_destroy_vlist_callback = to_destroy_vlist_callback;
BU_ASSERT(gedp->ged_gdp != NULL);
top->to_gedp->ged_gdp->gd_rtCmdNotify = to_rt_end_callback_internal;
@@ -6625,7 +6625,7 @@
HIDDEN void
-to_free_vlist_callback(unsigned int dlist, int range)
+to_destroy_vlist_callback(unsigned int dlist, int range)
{
struct bview *gdvp;
struct tclcad_ged_data *tgd = (struct tclcad_ged_data
*)current_top->to_gedp->u_data;
Modified: brlcad/branches/bioh/src/mged/chgview.c
===================================================================
--- brlcad/branches/bioh/src/mged/chgview.c 2020-08-01 06:55:05 UTC (rev
76629)
+++ brlcad/branches/bioh/src/mged/chgview.c 2020-08-01 06:59:18 UTC (rev
76630)
@@ -694,13 +694,13 @@
int
cmd_zap(ClientData UNUSED(clientData), Tcl_Interp *UNUSED(interp), int
UNUSED(argc), const char *UNUSED(argv[]))
{
- void (*tmp_callback)(unsigned int, int) = GEDP->ged_free_vlist_callback;
+ void (*tmp_callback)(unsigned int, int) = GEDP->ged_destroy_vlist_callback;
char *av[2] = {"zap", (char *)0};
CHECK_DBI_NULL;
update_views = 1;
- GEDP->ged_free_vlist_callback = freeDListsAll;
+ GEDP->ged_destroy_vlist_callback = freeDListsAll;
/* FIRST, reject any editing in progress */
if (STATE != ST_VIEW) {
@@ -712,7 +712,7 @@
(void)chg_state(STATE, STATE, "zap");
solid_list_callback();
- GEDP->ged_free_vlist_callback = tmp_callback;
+ GEDP->ged_destroy_vlist_callback = tmp_callback;
return TCL_OK;
}
Modified: brlcad/branches/bioh/src/mged/mged.c
===================================================================
--- brlcad/branches/bioh/src/mged/mged.c 2020-08-01 06:55:05 UTC (rev
76629)
+++ brlcad/branches/bioh/src/mged/mged.c 2020-08-01 06:59:18 UTC (rev
76630)
@@ -2778,8 +2778,8 @@
GEDP->ged_output_handler = mged_output_handler;
GEDP->ged_refresh_handler = mged_refresh_handler;
GEDP->ged_create_vlist_solid_callback = createDListSolid;
- GEDP->ged_create_vlist_callback = createDListAll;
- GEDP->ged_free_vlist_callback = freeDListsAll;
+ GEDP->ged_create_vlist_display_list_callback = createDListAll;
+ GEDP->ged_destroy_vlist_callback = freeDListsAll;
/* increment use count for gedp db instance */
(void)db_clone_dbi(DBIP, NULL);
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
