From ab422071ce4860718a8e2bbd781fc4d7104bde2e Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 7 Feb 2014 11:09:11 +0100 Subject: [PATCH] Initialize ramsize, and simply use an assignment to copy struct. --- src/surf/workstation_interface.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp index 72c0e109cb..5f8d501cc2 100644 --- a/src/surf/workstation_interface.cpp +++ b/src/surf/workstation_interface.cpp @@ -102,6 +102,7 @@ Workstation::Workstation(ModelPtr model, const char *name, xbt_dict_t props, : Resource(model, name, props) , p_storage(storage), p_netElm(netElm), p_cpu(cpu) { + p_params.ramsize = 0; surf_callback_emit(workstationCreatedCallbacks, this); } @@ -110,6 +111,7 @@ Workstation::Workstation(ModelPtr model, const char *name, xbt_dict_t props, lmm : Resource(model, name, props, constraint) , p_storage(storage), p_netElm(netElm), p_cpu(cpu) { + p_params.ramsize = 0; surf_callback_emit(workstationCreatedCallbacks, this); } @@ -330,13 +332,13 @@ xbt_dynar_t Workstation::getVms() void Workstation::getParams(ws_params_t params) { - memcpy(params, &p_params, sizeof(s_ws_params_t)); + *params = p_params; } void Workstation::setParams(ws_params_t params) { /* may check something here. */ - memcpy(&p_params, params, sizeof(s_ws_params_t)); + p_params = *params; } /********** -- 2.20.1