Follow coding style for sg_disk_{get,set}_data.

diff --git a/examples/c/io-disk-raw/io-disk-raw.c b/examples/c/io-disk-raw/io-disk-raw.c
index 5c1e40d..269a4b0 100644 (file)
--- a/examples/c/io-disk-raw/io-disk-raw.c
+++ b/examples/c/io-disk-raw/io-disk-raw.c
@@ -45,12 +45,12 @@ static void host(int argc, char* argv[])
   /* - Attach some user data to disk1 */
   XBT_INFO("*** Get/set data for storage element: Disk1 ***");
 
-  char* data = (char*)sg_disk_data(disk);
+  char* data = (char*)sg_disk_get_data(disk);
 
   XBT_INFO("Get storage data: '%s'", data ? data : "No user data");
 
-  sg_disk_data_set(disk, xbt_strdup("Some user data"));
-  data = (char*)sg_disk_data(disk);
+  sg_disk_set_data(disk, xbt_strdup("Some user data"));
+  data = (char*)sg_disk_get_data(disk);
   XBT_INFO("Set and get data: '%s'", data);
   free(data);
   free(disk_list);

diff --git a/include/simgrid/disk.h b/include/simgrid/disk.h
index 9ff8b33..e0c8874 100644 (file)
--- a/include/simgrid/disk.h
+++ b/include/simgrid/disk.h
@@ -17,8 +17,11 @@ XBT_PUBLIC double sg_disk_read_bandwidth(const_sg_disk_t disk);
 XBT_PUBLIC double sg_disk_write_bandwidth(const_sg_disk_t disk);
 XBT_PUBLIC sg_size_t sg_disk_write(sg_disk_t disk, sg_size_t size);
 XBT_PUBLIC sg_size_t sg_disk_read(sg_disk_t disk, sg_size_t size);
-XBT_PUBLIC void* sg_disk_data(const_sg_disk_t disk);
-XBT_PUBLIC void sg_disk_data_set(sg_disk_t disk, void* data);
+XBT_PUBLIC void* sg_disk_get_data(const_sg_disk_t disk);
+XBT_PUBLIC void sg_disk_set_data(sg_disk_t disk, void* data);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_disk_get_data() instead") XBT_PUBLIC void* sg_disk_data(const_sg_disk_t disk);
+XBT_ATTRIB_DEPRECATED_v330("Please use sg_disk_set_data() instead") XBT_PUBLIC
+    void sg_disk_data_set(sg_disk_t disk, void* data);
 SG_END_DECL
 
 #endif /* INCLUDE_SIMGRID_DISK_H_ */

diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp
index e2fdecf..100dc6e 100644 (file)
--- a/src/s4u/s4u_Disk.cpp
+++ b/src/s4u/s4u_Disk.cpp
@@ -108,11 +108,23 @@ sg_size_t sg_disk_write(sg_disk_t disk, sg_size_t size)
 {
   return disk->write(size);
 }
-void* sg_disk_data(const_sg_disk_t disk)
+
+void* sg_disk_get_data(const_sg_disk_t disk)
 {
   return disk->get_data();
 }
-void sg_disk_data_set(sg_disk_t disk, void* data)
+
+void sg_disk_set_data(sg_disk_t disk, void* data)
 {
   disk->set_data(data);
 }
+
+void* sg_disk_data(const_sg_disk_t disk) // XBT_ATTRIB_DEPRECATED_v330
+{
+  return sg_disk_get_data(disk);
+}
+
+void sg_disk_data_set(sg_disk_t disk, void* data) // XBT_ATTRIB_DEPRECATED_v330
+{
+  sg_disk_set_data(disk, data);
+}