From 3e1a5d6e94f57f640ba44644a2d78d8707d45f47 Mon Sep 17 00:00:00 2001 From: Dmitry Simonenko Date: Thu, 6 Jul 2017 14:41:06 +0300 Subject: [PATCH] shapito: update headers guard semantic --- sources/be_read.h | 6 +++--- sources/be_write.h | 6 +++--- sources/error.h | 6 +++--- sources/fe_read.h | 6 +++--- sources/{fewrite.h => fe_write.h} | 6 +++--- sources/header.h | 6 +++--- sources/key.h | 6 +++--- sources/macro.h | 6 +++--- sources/md5.h | 6 +++--- sources/parameter.h | 6 +++--- sources/password.h | 6 +++--- sources/read.h | 6 +++--- sources/shapito.h | 6 +++--- sources/stream.h | 6 +++--- 14 files changed, 42 insertions(+), 42 deletions(-) rename sources/{fewrite.h => fe_write.h} (98%) diff --git a/sources/be_read.h b/sources/be_read.h index c5d0e32d..8755f22b 100644 --- a/sources/be_read.h +++ b/sources/be_read.h @@ -1,5 +1,5 @@ -#ifndef SO_BEREAD_H_ -#define SO_BEREAD_H_ +#ifndef SHAPITO_BE_READ_H +#define SHAPITO_BE_READ_H /* * SHAPITO. @@ -41,4 +41,4 @@ so_bestartup_free(so_bestartup_t *su) int so_beread_startup(so_bestartup_t*, char*, uint32_t); int so_beread_password(so_password_t*, char*, uint32_t); -#endif +#endif /* SHAPITO_BE_READ_H */ diff --git a/sources/be_write.h b/sources/be_write.h index 51c32772..92dd7aea 100644 --- a/sources/be_write.h +++ b/sources/be_write.h @@ -1,5 +1,5 @@ -#ifndef SO_BEWRITE_H_ -#define SO_BEWRITE_H_ +#ifndef SHAPITO_BE_WRITE_H +#define SHAPITO_BE_WRITE_H /* * SHAPITO. @@ -305,4 +305,4 @@ so_bewrite_no_data(so_stream_t *stream) return 0; } -#endif +#endif /* SHAPITO_BE_WRITE_H */ diff --git a/sources/error.h b/sources/error.h index 2135a7e3..343aa823 100644 --- a/sources/error.h +++ b/sources/error.h @@ -1,5 +1,5 @@ -#ifndef SO_ERROR_H -#define SO_ERROR_H +#ifndef SHAPITO_ERROR_H +#define SHAPITO_ERROR_H /* * SHAPITO. @@ -341,4 +341,4 @@ #define SO_ERROR_DATA_CORRUPTED "XX001" #define SO_ERROR_INDEX_CORRUPTED "XX002" -#endif +#endif /* SHAPITO_ERROR_H */ diff --git a/sources/fe_read.h b/sources/fe_read.h index f51c66d8..ece7d164 100644 --- a/sources/fe_read.h +++ b/sources/fe_read.h @@ -1,5 +1,5 @@ -#ifndef SO_FEREAD_H_ -#define SO_FEREAD_H_ +#ifndef SHAPITO_FE_READ_H +#define SHAPITO_FE_READ_H /* * SHAPITO. @@ -24,4 +24,4 @@ int so_feread_auth(uint32_t*, char[4], char*, uint32_t); int so_feread_parameter(so_parameters_t*, char*, uint32_t); int so_feread_error(so_feerror_t*, char*, uint32_t); -#endif +#endif /* SHAPITO_FE_READ_H */ diff --git a/sources/fewrite.h b/sources/fe_write.h similarity index 98% rename from sources/fewrite.h rename to sources/fe_write.h index a5f9954b..1ce169e5 100644 --- a/sources/fewrite.h +++ b/sources/fe_write.h @@ -1,5 +1,5 @@ -#ifndef SO_FEWRITE_H_ -#define SO_FEWRITE_H_ +#ifndef SHAPITO_FE_WRITE_H +#define SHAPITO_FE_WRITE_H /* * SHAPITO. @@ -218,4 +218,4 @@ so_fewrite_sync(so_stream_t *stream) return 0; } -#endif +#endif /* SHAPITO_FE_WRITE_H */ diff --git a/sources/header.h b/sources/header.h index bddde5ce..610e621a 100644 --- a/sources/header.h +++ b/sources/header.h @@ -1,5 +1,5 @@ -#ifndef SO_HEADER_H_ -#define SO_HEADER_H_ +#ifndef SHAPITO_HEADER_H +#define SHAPITO_HEADER_H /* * SHAPITO. @@ -16,4 +16,4 @@ struct so_header char data[]; } so_packed; -#endif +#endif /* SHAPITO_HEADER_H */ diff --git a/sources/key.h b/sources/key.h index 6dd215ee..35e96a9e 100644 --- a/sources/key.h +++ b/sources/key.h @@ -1,5 +1,5 @@ -#ifndef SO_KEY_H_ -#define SO_KEY_H_ +#ifndef SHAPITO_KEY_H +#define SHAPITO_KEY_H /* * SHAPITO. @@ -29,4 +29,4 @@ so_keycmp(so_key_t *a, so_key_t *b) a->key_pid == b->key_pid; } -#endif +#endif /* SHAPITO_KEY_H */ diff --git a/sources/macro.h b/sources/macro.h index fad3b62c..573d3d75 100644 --- a/sources/macro.h +++ b/sources/macro.h @@ -1,5 +1,5 @@ -#ifndef SO_MACRO_H_ -#define SO_MACRO_H_ +#ifndef SHAPITO_MACRO_H +#define SHAPITO_MACRO_H /* * SHAPITO. @@ -13,4 +13,4 @@ #define so_container_of(ptr, t, f) \ ((t*)((char*)(ptr) - __builtin_offsetof(t, f))) -#endif +#endif /* SHAPITO_MACRO_H */ diff --git a/sources/md5.h b/sources/md5.h index e1fdba06..a87fd4ec 100644 --- a/sources/md5.h +++ b/sources/md5.h @@ -1,5 +1,5 @@ -#ifndef SO_MD5_H_ -#define SO_MD5_H_ +#ifndef SHAPITO_MD5_H +#define SHAPITO_MD5_H /* * SHAPITO. @@ -21,4 +21,4 @@ void so_md5_update(so_md5_t*, void*, size_t); void so_md5_final(so_md5_t*, uint8_t[16]); void so_md5_tostring(char*, uint8_t[16]); -#endif +#endif /* SHAPITO_MD5_H */ diff --git a/sources/parameter.h b/sources/parameter.h index 4a579258..a3b4bcfc 100644 --- a/sources/parameter.h +++ b/sources/parameter.h @@ -1,5 +1,5 @@ -#ifndef SO_PARAMETER_H_ -#define SO_PARAMETER_H_ +#ifndef SHAPITO_PARAMETER_H +#define SHAPITO_PARAMETER_H /* * SHAPITO. @@ -56,4 +56,4 @@ so_parameters_free(so_parameters_t *params) int so_parameters_add(so_parameters_t*, char*, uint32_t, char*, uint32_t); -#endif +#endif /* SHAPITO_PARAMETER_H */ diff --git a/sources/password.h b/sources/password.h index 79ccb761..7ec1eb1d 100644 --- a/sources/password.h +++ b/sources/password.h @@ -1,5 +1,5 @@ -#ifndef SO_PASSWORD_H_ -#define SO_PASSWORD_H_ +#ifndef SHAPITO_PASSWORD_H +#define SHAPITO_PASSWORD_H /* * SHAPITO. @@ -40,4 +40,4 @@ uint32_t so_password_salt(so_key_t*); int so_password_md5(so_password_t*, char*, int, char*, int, char[4]); -#endif +#endif /* SHAPITO_PASSWORD_H */ diff --git a/sources/read.h b/sources/read.h index 7ddaf3d1..35c2617b 100644 --- a/sources/read.h +++ b/sources/read.h @@ -1,5 +1,5 @@ -#ifndef SO_READ_H_ -#define SO_READ_H_ +#ifndef SHAPITO_READ_H +#define SHAPITO_READ_H /* * SHAPITO. @@ -10,4 +10,4 @@ int so_read_startup(uint32_t*, char**, uint32_t*); int so_read(uint32_t*, char**, uint32_t*); -#endif +#endif /* SHAPITO_READ_H */ diff --git a/sources/shapito.h b/sources/shapito.h index 798e1c25..c4e66442 100644 --- a/sources/shapito.h +++ b/sources/shapito.h @@ -1,5 +1,5 @@ -#ifndef SHAPITO_H_ -#define SHAPITO_H_ +#ifndef SHAPITO_H +#define SHAPITO_H /* * SHAPITO. @@ -27,4 +27,4 @@ #include "sources/be_read.h" #include "sources/fe_read.h" -#endif +#endif /* SHAPITO_H */ diff --git a/sources/stream.h b/sources/stream.h index 81d276b3..497323bd 100644 --- a/sources/stream.h +++ b/sources/stream.h @@ -1,5 +1,5 @@ -#ifndef SO_BUF_H_ -#define SO_BUF_H_ +#ifndef SHAPITO_BUF_H +#define SHAPITO_BUF_H /* * SHAPITO. @@ -197,4 +197,4 @@ so_stream_read(uint32_t n, char **pos, uint32_t *size) return 0; } -#endif +#endif /* SHAPITO_BUF_H */