From 4eb0ed46e1f1779e46ce1e24c8cf2bce6cb69738 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 15 Mar 2022 18:51:31 +0200 Subject: [PATCH 49/49] attribute.[ch]: Improve coding style See osdn #44104 Signed-off-by: Marko Lindqvist --- client/attribute.c | 23 ++++++++++++----------- client/attribute.h | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/client/attribute.c b/client/attribute.c index 52792b3db4..b7eb4d09ed 100644 --- a/client/attribute.c +++ b/client/attribute.c @@ -143,7 +143,7 @@ serialize_hash(const struct attribute_hash *hash, * uint32 entries; * uint32 total_size_in_bytes; * } preamble; - * + * * struct { * uint32 value_size; * char key[], char value[]; @@ -334,8 +334,9 @@ void attribute_flush(void) fc_assert_ret(NULL != attribute_hash); - if (0 == attribute_hash_size(attribute_hash)) + if (0 == attribute_hash_size(attribute_hash)) { return; + } if (pplayer->attribute_block.data) { free(pplayer->attribute_block.data); @@ -409,7 +410,7 @@ void attribute_set(int key, int id, int x, int y, size_t data_length, Low-level function to get an attribute. If data hasn't enough space to hold the attribute data isn't set to the attribute. Returns the actual size of the attribute. Can be zero if the attribute is - unset. To get the size of an attribute use + unset. To get the size of an attribute use size = attribute_get(key, id, x, y, 0, NULL) *****************************************************************************/ size_t attribute_get(int key, int id, int x, int y, size_t max_data_length, @@ -446,7 +447,7 @@ size_t attribute_get(int key, int id, int x, int y, size_t max_data_length, Set unit related attribute ****************************************************************************/ void attr_unit_set(enum attr_unit what, int unit_id, size_t data_length, - const void *const data) + const void *const data) { attribute_set(what, unit_id, -1, -2, data_length, data); } @@ -455,7 +456,7 @@ void attr_unit_set(enum attr_unit what, int unit_id, size_t data_length, Get unit related attribute ****************************************************************************/ size_t attr_unit_get(enum attr_unit what, int unit_id, size_t max_data_length, - void *data) + void *data) { return attribute_get(what, unit_id, -1, -2, max_data_length, data); } @@ -480,7 +481,7 @@ size_t attr_unit_get_int(enum attr_unit what, int unit_id, int *data) Set city related attribute ****************************************************************************/ void attr_city_set(enum attr_city what, int city_id, size_t data_length, - const void *const data) + const void *const data) { attribute_set(what, city_id, -1, -1, data_length, data); } @@ -489,7 +490,7 @@ void attr_city_set(enum attr_city what, int city_id, size_t data_length, Get city related attribute ****************************************************************************/ size_t attr_city_get(enum attr_city what, int city_id, size_t max_data_length, - void *data) + void *data) { return attribute_get(what, city_id, -1, -1, max_data_length, data); } @@ -514,7 +515,7 @@ size_t attr_city_get_int(enum attr_city what, int city_id, int *data) Set player related attribute ****************************************************************************/ void attr_player_set(enum attr_player what, int player_id, size_t data_length, - const void *const data) + const void *const data) { attribute_set(what, player_id, -1, -1, data_length, data); } @@ -523,7 +524,7 @@ void attr_player_set(enum attr_player what, int player_id, size_t data_length, Get player related attribute ****************************************************************************/ size_t attr_player_get(enum attr_player what, int player_id, - size_t max_data_length, void *data) + size_t max_data_length, void *data) { return attribute_get(what, player_id, -1, -1, max_data_length, data); } @@ -532,7 +533,7 @@ size_t attr_player_get(enum attr_player what, int player_id, Set tile related attribute ****************************************************************************/ void attr_tile_set(enum attr_tile what, int x, int y, size_t data_length, - const void *const data) + const void *const data) { attribute_set(what, -1, x, y, data_length, data); } @@ -541,7 +542,7 @@ void attr_tile_set(enum attr_tile what, int x, int y, size_t data_length, Get tile related attribute ****************************************************************************/ size_t attr_tile_get(enum attr_tile what, int x, int y, size_t max_data_length, - void *data) + void *data) { return attribute_get(what, -1, x, y, max_data_length, data); } diff --git a/client/attribute.h b/client/attribute.h index 168b9da8f1..44022dbd9f 100644 --- a/client/attribute.h +++ b/client/attribute.h @@ -1,4 +1,4 @@ -/********************************************************************** +/*********************************************************************** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ extern "C" { #endif /* __cplusplus */ -#include /* size_t */ +#include /* size_t */ /* * If 4 byte wide signed int is used this gives 20 object types with @@ -35,7 +35,7 @@ enum attr_unit { }; enum attr_city { - ATTR_CITY_CMA_PARAMETER = ATTR_CITY_START, + ATTR_CITY_CMA_PARAMETER = ATTR_CITY_START, ATTR_CITY_CMAFE_PARAMETER }; @@ -55,17 +55,17 @@ void attribute_free(void); void attribute_flush(void); void attribute_restore(void); void attribute_set(int key, int id, int x, int y, size_t data_length, - const void *const data); + const void *const data); size_t attribute_get(int key, int id, int x, int y, size_t max_data_length, - void *data); + void *data); /* * Special methods for units. */ void attr_unit_set(enum attr_unit what, int unit_id, size_t data_length, - const void *const data); + const void *const data); size_t attr_unit_get(enum attr_unit what, int unit_id, size_t max_data_length, - void *data); + void *data); void attr_unit_set_int(enum attr_unit what, int unit_id, int data); size_t attr_unit_get_int(enum attr_unit what, int unit_id, int *data); @@ -74,9 +74,9 @@ size_t attr_unit_get_int(enum attr_unit what, int unit_id, int *data); * Special methods for cities. */ void attr_city_set(enum attr_city what, int city_id, size_t data_length, - const void *const data); + const void *const data); size_t attr_city_get(enum attr_city what, int city_id, size_t max_data_length, - void *data); + void *data); void attr_city_set_int(enum attr_city what, int city_id, int data); size_t attr_city_get_int(enum attr_city what, int city_id, int *data); @@ -84,17 +84,17 @@ size_t attr_city_get_int(enum attr_city what, int city_id, int *data); * Special methods for players. */ void attr_player_set(enum attr_player what, int player_id, size_t data_length, - const void *const data); + const void *const data); size_t attr_player_get(enum attr_player what, int player_id, - size_t max_data_length, void *data); + size_t max_data_length, void *data); /* * Special methods for tiles. */ void attr_tile_set(enum attr_tile what, int x, int y, size_t data_length, - const void *const data); + const void *const data); size_t attr_tile_get(enum attr_tile what, int x, int y, size_t max_data_length, - void *data); + void *data); #ifdef __cplusplus } -- 2.35.1