Revision: 41805
http://brlcad.svn.sourceforge.net/brlcad/?rev=41805&view=rev
Author: brlcad
Date: 2010-12-27 23:22:50 +0000 (Mon, 27 Dec 2010)
Log Message:
-----------
fix sscanf bug. specify the array address itself instead of a double pointer.
Modified Paths:
--------------
brlcad/trunk/src/mged/clone.c
brlcad/trunk/src/mged/cmd.c
Modified: brlcad/trunk/src/mged/clone.c
===================================================================
--- brlcad/trunk/src/mged/clone.c 2010-12-27 23:21:17 UTC (rev 41804)
+++ brlcad/trunk/src/mged/clone.c 2010-12-27 23:22:50 UTC (rev 41805)
@@ -234,11 +234,11 @@
/* Ugh. This needs much repair/cleanup. */
if (state->updpos == 0) {
- sscanf(dp->d_namep, "%[!-/,:-~]%d%[!-/,:-~]%512s", &prefix, &num,
&suffix, &suffix2); /* CLONE_BUFSIZE */
+ sscanf(dp->d_namep, "%[!-/,:-~]%d%[!-/,:-~]%512s", prefix, &num,
suffix, suffix2); /* CLONE_BUFSIZE */
snprintf(suffix, CLONE_BUFSIZE, "%s", suffix2);
} else if (state->updpos == 1) {
int num2 = 0;
- sscanf(dp->d_namep, "%[!-/,:-~]%d%[!-/,:-~]%d%[!-/,:-~]", &prefix,
&num2, &suffix2, &num, &suffix);
+ sscanf(dp->d_namep, "%[!-/,:-~]%d%[!-/,:-~]%d%[!-/,:-~]", prefix,
&num2, suffix2, &num, suffix);
snprintf(prefix, CLONE_BUFSIZE, "%s%d%s", prefix, num2, suffix2);
} else
bu_exit(EXIT_FAILURE, "multiple -c options not supported yet.");
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2010-12-27 23:21:17 UTC (rev 41804)
+++ brlcad/trunk/src/mged/cmd.c 2010-12-27 23:22:50 UTC (rev 41805)
@@ -593,7 +593,7 @@
* Usage: loadtk [displayname[.screennum]]
*/
int
-cmd_tk(ClientData clientData, Tcl_Interp *interpreter, int argc, char **argv)
+cmd_tk(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, char
**argv)
{
int status;
@@ -623,7 +623,7 @@
* output hook!
*/
int
-cmd_output_hook(ClientData clientData, Tcl_Interp *interpreter, int argc, char
**argv)
+cmd_output_hook(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int
argc, char **argv)
{
struct bu_vls infocommand;
int status;
@@ -679,7 +679,7 @@
* C M D _ N O P
*/
int
-cmd_nop(ClientData clientData, Tcl_Interp *interpreter, int argc, char **argv)
+cmd_nop(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, char
**argv)
{
return TCL_OK;
}
@@ -692,11 +692,11 @@
* reinterpreted (using atol() and a cast) as a a pointer.
*/
int
-cmd_get_ptr(ClientData clientData, Tcl_Interp *interpreter, int argc, char
**argv)
+cmd_get_ptr(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc,
char **argv)
{
char buf[128] = {0};
- if (dbip == DBI_NULL) {
+ if (dbip == DBI_NULL || argc < 0 || !argv) {
return TCL_ERROR;
}
@@ -707,7 +707,7 @@
int
-cmd_cmd_win(ClientData clientData, Tcl_Interp *interpreter, int argc, char
**argv)
+cmd_cmd_win(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc,
const char *argv[])
{
struct bu_vls vls;
@@ -844,11 +844,13 @@
int
-cmd_get_more_default(ClientData clientData, Tcl_Interp *interpreter, int argc,
char **argv)
+cmd_get_more_default(ClientData UNUSED(clientData), Tcl_Interp *interpreter,
int argc, char **argv)
{
if (argc != 1) {
struct bu_vls vls;
+ bu_log("Unrecognized option [%s]\n", argv[1]);
+
bu_vls_init(&vls);
bu_vls_printf(&vls, "helpdevel get_more_default");
Tcl_Eval(interpreter, bu_vls_addr(&vls));
@@ -862,7 +864,7 @@
int
-cmd_set_more_default(ClientData clientData, Tcl_Interp *interpreter, int argc,
char **argv)
+cmd_set_more_default(ClientData UNUSED(clientData), Tcl_Interp *interpreter,
int argc, char **argv)
{
if (argc != 2) {
struct bu_vls vls;
@@ -1178,7 +1180,7 @@
void
-mged_print_result(int status)
+mged_print_result(int UNUSED(status))
{
size_t len;
const char *result = Tcl_GetStringResult(interp);
@@ -1262,7 +1264,7 @@
* Let the user temporarily escape from the editor Format: %
*/
int
-f_comm(ClientData clientData, Tcl_Interp *interpreter, int argc, const char
*argv[])
+f_comm(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, const
char *argv[])
{
if (argc != 1 || !classic_mged || curr_cmd_list != &head_cmd_list) {
@@ -1303,7 +1305,7 @@
* Quit and exit gracefully. Format: q
*/
int
-f_quit(ClientData clientData, Tcl_Interp *interpreter, int argc, const char
**argv)
+f_quit(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, const
char **argv)
{
if (argc < 1 || 1 < argc) {
struct bu_vls vls;
@@ -1423,7 +1425,7 @@
* tie -u cw1 ---> removes the association, if it exists, cw1 has with a
display manager
*/
int
-f_tie(ClientData clientData, Tcl_Interp *interpreter, int argc, char **argv)
+f_tie(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc, char
**argv)
{
int uflag = 0; /* untie flag */
struct cmd_list *clp;
@@ -1654,7 +1656,7 @@
int
-f_winset(ClientData clientData, Tcl_Interp *interpreter, int argc, char **argv)
+f_winset(ClientData UNUSED(clientData), Tcl_Interp *interpreter, int argc,
char **argv)
{
struct dm_list *p;
@@ -1726,7 +1728,7 @@
int
-f_bomb(ClientData clientData, Tcl_Interp *interpreter, int argc, const char
*argv[])
+f_bomb(ClientData UNUSED(clientData), Tcl_Interp *UNUSED(interpreter), int
argc, const char *argv[])
{
char buffer[1024] = {0};
struct bu_vls vls;
@@ -1749,7 +1751,7 @@
int
-cmd_rt_gettrees(ClientData clientData,
+cmd_rt_gettrees(ClientData UNUSED(clientData),
Tcl_Interp *interpreter,
int argc,
char **argv)
@@ -1791,7 +1793,7 @@
* in.
*/
int
-cmd_units(ClientData clientData,
+cmd_units(ClientData UNUSED(clientData),
Tcl_Interp *interpreter,
int argc,
char **argv)
@@ -1830,7 +1832,7 @@
* objects.
*/
int
-cmd_search(ClientData clientData,
+cmd_search(ClientData UNUSED(clientData),
Tcl_Interp *interpreter,
int argc,
char **argv)
@@ -1857,7 +1859,7 @@
* List regions based on values of their MUVES_Component attribute
*/
int
-cmd_lm(ClientData clientData,
+cmd_lm(ClientData UNUSED(clientData),
Tcl_Interp *interpreter,
int argc,
char **argv)
@@ -1946,7 +1948,7 @@
* "tol perp #" sets calculational normal tolerance.
*/
int
-cmd_tol(ClientData clientData,
+cmd_tol(ClientData UNUSED(clientData),
Tcl_Interp *interpreter,
int argc,
char **argv)
@@ -1981,7 +1983,7 @@
* Format: B object
*/
int
-cmd_blast(ClientData clientData, Tcl_Interp *interpreter, int argc, const char
*argv[])
+cmd_blast(ClientData UNUSED(clientData), Tcl_Interp *UNUSED(interpreter), int
argc, const char *argv[])
{
const char *av[2];
int ret;
@@ -2007,23 +2009,23 @@
* Edit something (add to visible display). Format: e object
*/
int
-cmd_draw(ClientData clientData, Tcl_Interp *interpreter, int argc, const char
*argv[])
+cmd_draw(ClientData UNUSED(clientData), Tcl_Interp *UNUSED(interpreter), int
argc, const char *argv[])
{
return edit_com(argc, argv, 1, 1);
}
-extern int emuves_com(int argc, char **argv); /* from chgview.c */
+extern int emuves_com(int argc, const char *argv[]); /* from chgview.c */
/**
* Add regions with attribute MUVES_Component haveing the specified values
* Format: em value [value value ...]
*/
int
-cmd_emuves(ClientData clientData,
- Tcl_Interp *interpreter,
+cmd_emuves(ClientData UNUSED(clientData),
+ Tcl_Interp *UNUSED(interpreter),
int argc,
- char **argv)
+ const char *argv[])
{
return emuves_com(argc, argv);
}
@@ -2033,8 +2035,8 @@
* Format: ev objects
*/
int
-cmd_ev(ClientData clientData,
- Tcl_Interp *interpreter,
+cmd_ev(ClientData UNUSED(clientData),
+ Tcl_Interp *UNUSED(interpreter),
int argc,
const char *argv[])
{
@@ -2049,8 +2051,8 @@
* display). Usage: E object(s)
*/
int
-cmd_E(ClientData clientData,
- Tcl_Interp *interpreter,
+cmd_E(ClientData UNUSED(clientData),
+ Tcl_Interp *UNUSED(interpreter),
int argc,
const char **argv)
{
@@ -2059,7 +2061,7 @@
int
-cmd_shaded_mode(ClientData clientData,
+cmd_shaded_mode(ClientData UNUSED(clientData),
Tcl_Interp *interpreter,
int argc,
char **argv)
@@ -2119,10 +2121,10 @@
int
-cmd_has_embedded_fb(ClientData clientData,
+cmd_has_embedded_fb(ClientData UNUSED(clientData),
Tcl_Interp *interpreter,
- int argc,
- char **argv)
+ int UNUSED(argc),
+ char **UNUSED(argv))
{
#ifdef USE_FBSERV
Tcl_AppendResult(interpreter, "1", NULL);
@@ -2135,7 +2137,7 @@
int
-cmd_stub(ClientData clientData,
+cmd_stub(ClientData UNUSED(clientData),
Tcl_Interp *interpreter,
int argc,
char **argv)
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
