Revision: 77747
          http://sourceforge.net/p/brlcad/code/77747
Author:   brlcad
Date:     2020-11-18 23:50:16 +0000 (Wed, 18 Nov 2020)
Log Message:
-----------
if there are no objects and no references, say so and return an error (match 
'mv' semantics).

Modified Paths:
--------------
    brlcad/trunk/src/libged/move_all/move_all.c

Modified: brlcad/trunk/src/libged/move_all/move_all.c
===================================================================
--- brlcad/trunk/src/libged/move_all/move_all.c 2020-11-18 23:46:20 UTC (rev 
77746)
+++ brlcad/trunk/src/libged/move_all/move_all.c 2020-11-18 23:50:16 UTC (rev 
77747)
@@ -44,6 +44,7 @@
     struct rt_db_internal intern;
     struct rt_comb_internal *comb;
     struct bu_ptbl stack;
+    size_t moved = 0;
 
     /* check the old_name source and new_name target */
 
@@ -100,6 +101,8 @@
 
                if (rt_db_put_internal(dirp, gedp->ged_wdbp->dbip, &intern, 
&rt_uniresource) < 0) {
                    bu_log("INTERNAL ERROR: unable to write sketch [%s] during 
mvall\n", new_name);
+               } else {
+                   moved++;
                }
                rt_db_free_internal(&intern);
            }
@@ -123,6 +126,7 @@
            bu_vls_printf(gedp->ged_result_str, "Database write error, 
aborting");
            return GED_ERROR;
        }
+       moved++;
     }
 
     bu_ptbl_init(&stack, 64, "combination stack for wdb_mvall_cmd");
@@ -177,6 +181,7 @@
                    return GED_ERROR;
                }
            }
+           moved++;
        }
     }
 
@@ -221,6 +226,11 @@
        }
     }
 
+    if (!moved) {
+       bu_log("ERROR: move %s to %s: no such object or reference\n", old_name, 
new_name);
+       return GED_ERROR;
+    }
+
     return GED_OK;
 }
 

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

Reply via email to