Revision: 41802
http://brlcad.svn.sourceforge.net/brlcad/?rev=41802&view=rev
Author: brlcad
Date: 2010-12-27 22:31:54 +0000 (Mon, 27 Dec 2010)
Log Message:
-----------
remove the duplicate function declarations for the f_* commands. mark
open/close/quit as const.
Modified Paths:
--------------
brlcad/trunk/src/mged/cmd.c
brlcad/trunk/src/mged/cmd.h
brlcad/trunk/src/mged/mged.c
brlcad/trunk/src/mged/mged.h
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2010-12-27 20:05:40 UTC (rev 41801)
+++ brlcad/trunk/src/mged/cmd.c 2010-12-27 22:31:54 UTC (rev 41802)
@@ -1303,7 +1303,7 @@
* Quit and exit gracefully. Format: q
*/
int
-f_quit(ClientData clientData, Tcl_Interp *interpreter, int argc, char **argv)
+f_quit(ClientData clientData, Tcl_Interp *interpreter, int argc, const char
**argv)
{
if (argc < 1 || 1 < argc) {
struct bu_vls vls;
Modified: brlcad/trunk/src/mged/cmd.h
===================================================================
--- brlcad/trunk/src/mged/cmd.h 2010-12-27 20:05:40 UTC (rev 41801)
+++ brlcad/trunk/src/mged/cmd.h 2010-12-27 22:31:54 UTC (rev 41802)
@@ -173,7 +173,7 @@
BU_EXTERN(int cmd_zap, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int cmd_zoom, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_3ptarb, (ClientData, Tcl_Interp *, int, char **));
-BU_EXTERN(int f_adc, (ClientData, Tcl_Interp *, int, char **));
+BU_EXTERN(int f_adc, (ClientData, Tcl_Interp *, int, const char **));
BU_EXTERN(int f_aip, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_amtrack, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_analyze, (ClientData, Tcl_Interp *, int, char **));
@@ -190,7 +190,7 @@
BU_EXTERN(int f_bot_merge, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_bot_split, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_clone, (ClientData, Tcl_Interp *, int, char **));
-BU_EXTERN(int f_closedb, (ClientData, Tcl_Interp *, int, char **));
+BU_EXTERN(int f_closedb, (ClientData, Tcl_Interp *, int, const char **));
BU_EXTERN(int f_comb_color, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_comm, (ClientData, Tcl_Interp *, int, const char *[]));
BU_EXTERN(int f_copy_inv, (ClientData, Tcl_Interp *, int, char **));
@@ -251,7 +251,7 @@
BU_EXTERN(int f_nirt, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_oedit_apply, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_oedit_reset, (ClientData, Tcl_Interp *, int, char **));
-BU_EXTERN(int f_opendb, (ClientData, Tcl_Interp *, int, char **));
+BU_EXTERN(int f_opendb, (ClientData, Tcl_Interp *, int, const char **));
BU_EXTERN(int f_param, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_permute, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_pl, (ClientData, Tcl_Interp *, int, const char **));
@@ -265,8 +265,7 @@
BU_EXTERN(int f_putmat, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_qorot, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_qray, (ClientData, Tcl_Interp *, int, char **));
-BU_EXTERN(int f_quit, (ClientData, Tcl_Interp *, int, char **));
-BU_EXTERN(int f_quit, (ClientData, Tcl_Interp *, int, char **));
+BU_EXTERN(int f_quit, (ClientData, Tcl_Interp *, int, const char **));
BU_EXTERN(int f_qvrot, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_rcodes, (ClientData, Tcl_Interp *, int, char **));
BU_EXTERN(int f_read_muves, (ClientData, Tcl_Interp *, int, char **));
Modified: brlcad/trunk/src/mged/mged.c
===================================================================
--- brlcad/trunk/src/mged/mged.c 2010-12-27 20:05:40 UTC (rev 41801)
+++ brlcad/trunk/src/mged/mged.c 2010-12-27 22:31:54 UTC (rev 41802)
@@ -2585,11 +2585,7 @@
* NOT opened (and the user didn't abort).
*/
int
-f_opendb(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv)
+f_opendb(ClientData clientData, Tcl_Interp *interpreter, int argc, const char
**argv)
{
struct ged *save_gedp;
struct db_i *save_dbip = DBI_NULL;
@@ -2899,21 +2895,18 @@
* Close the current database, if open.
*/
int
-f_closedb(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **UNUSED(argv))
+f_closedb(ClientData clientData, Tcl_Interp *interpreter, int argc, const char
**argv)
{
const char *av[2];
if (argc != 1) {
+ Tcl_AppendResult(interpreter, "Unexpected argument [%s]\n", (const char
*)argv[1], NULL);
Tcl_Eval(interpreter, "help closedb");
return TCL_ERROR;
}
if (dbip == DBI_NULL ) {
- Tcl_AppendResult(interpreter, "No database is open\n", (char *)NULL);
+ Tcl_AppendResult(interpreter, "No database is open\n", NULL);
return TCL_OK;
}
Modified: brlcad/trunk/src/mged/mged.h
===================================================================
--- brlcad/trunk/src/mged/mged.h 2010-12-27 20:05:40 UTC (rev 41801)
+++ brlcad/trunk/src/mged/mged.h 2010-12-27 22:31:54 UTC (rev 41802)
@@ -454,9 +454,6 @@
#define MORE_ARGS_STR "more arguments needed::"
-/* adc.c */
-int f_adc (ClientData clientData, Tcl_Interp *interpreter, int argc, char
**argv);
-
/* attach.c */
int is_dm_null(void);
int mged_attach(struct w_dm *wp, int argc, const char **argv);
@@ -521,27 +518,6 @@
char **argv);
/* chgview.c */
-void eraseobjpath(
- Tcl_Interp *interpreter,
- int argc,
- char **argv,
- int noisy,
- int all);
-int f_erase(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv);
-int f_erase_all(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv);
-int f_zap(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv);
int mged_erot_xyz(char origin, vect_t rvec);
int mged_svbase(void);
int mged_vrot_xyz(char origin, char coords, vect_t rvec);
@@ -553,11 +529,6 @@
/* cmd.c */
int cmdline(struct bu_vls *vp, int record);
-int f_quit(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv);
int mged_cmd(
int argc,
char **argv,
@@ -640,16 +611,6 @@
/* mged.c */
int event_check(int non_blocking);
-int f_opendb(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv);
-int f_closedb(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv);
void new_edit_mats(void);
void new_mats(void);
void pr_beep(void);
@@ -668,33 +629,15 @@
/* menu.c */
int mmenu_select(int pen_y, int do_func);
-/* overlay.c */
-int f_overlay(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv);
-
/* predictor.c */
extern void predictor_frame(void);
extern void predictor_init(void);
/* usepen.c */
-int f_mouse(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv);
-int f_aip(
- ClientData clientData,
- Tcl_Interp *interpreter,
- int argc,
- char **argv);
void buildHrot(mat_t mat, double alpha, double beta, double ggamma);
void wrt_view(mat_t out, const mat_t change, const mat_t in);
void wrt_point(mat_t out, const mat_t change, const mat_t in, const point_t
point);
void wrt_point_direc(mat_t out, const mat_t change, const mat_t in, const
point_t point, const vect_t direc);
-int f_matpick(ClientData clientData, Tcl_Interp *interpreter, int argc, char
**argv);
/* tedit.c */
int get_editor_string(struct bu_vls *editstring);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
