make clang happy

Author: Goober5000

fred2/waypointpathdlg.cpp

@@ -138,8 +138,6 @@ void waypoint_path_dlg::initialize_data(int full_update)
 
 int waypoint_path_dlg::update_data(int redraw)
 {
-	const char *str;
-	char old_name[255];
 	int i, z;
 	object *ptr;
 
@@ -264,9 +262,10 @@ int waypoint_path_dlg::update_data(int redraw)
 		}
 
 
+		char old_name[NAME_LENGTH];
 		strcpy_s(old_name, cur_waypoint_list->get_name());
 		cur_waypoint_list->set_name((LPCTSTR) m_name);
-		str = cur_waypoint_list->get_name();
+		auto str = cur_waypoint_list->get_name();
 		if (strcmp(old_name, str)) {
 			set_modified(TRUE);
 			update_sexp_references(old_name, str);

qtfred/src/mission/dialogs/WaypointEditorDialogModel.cpp

@@ -22,7 +22,7 @@ bool WaypointEditorDialogModel::apply()
 	}
 
 	// apply name
-	char old_name[255];
+	char old_name[NAME_LENGTH];
 	strcpy_s(old_name, _editor->cur_waypoint_list->get_name());
 	_editor->cur_waypoint_list->set_name(_currentName.c_str());
 	auto str = _editor->cur_waypoint_list->get_name();
@@ -32,8 +32,8 @@ bool WaypointEditorDialogModel::apply()
 		_editor->ai_update_goal_references(sexp_ref_type::WAYPOINT_PATH, old_name, str);
 
 		for (auto &wpt : _editor->cur_waypoint_list->get_waypoints()) {
-			char old_buf[NAME_LENGTH + 8];
-			char new_buf[NAME_LENGTH + 8];
+			char old_buf[NAME_LENGTH + 12];
+			char new_buf[NAME_LENGTH + 12];
 			sprintf(old_buf, "%s:%d", old_name, wpt.get_index() + 1);
 			sprintf(new_buf, "%s:%d", str, wpt.get_index() + 1);
 			update_sexp_references(old_buf, new_buf);