From 94ca89b8693665b770a3160fb892b89a962bebd9 Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Sun, 13 Dec 2020 20:51:28 +0500 Subject: [PATCH] Use typedef "Shmemq" --- examples/raw_receiver.c | 2 +- examples/raw_sender.c | 2 +- include/shmemq.h | 8 ++++---- src/main.c | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/raw_receiver.c b/examples/raw_receiver.c index 330a9ed..35c9068 100644 --- a/examples/raw_receiver.c +++ b/examples/raw_receiver.c @@ -32,7 +32,7 @@ int main() printf("Create queue.\n"); enum Shmemq_Error shmemq_error; - struct Shmemq *shmemq = shmemq_new("/buffer1", true, &shmemq_error); + Shmemq shmemq = shmemq_new("/buffer1", true, &shmemq_error); assert(shmemq_error == SHMEMQ_ERROR_NONE); assert(shmemq != NULL); diff --git a/examples/raw_sender.c b/examples/raw_sender.c index cba8c17..d5cf3ae 100644 --- a/examples/raw_sender.c +++ b/examples/raw_sender.c @@ -23,7 +23,7 @@ int main() printf("Create queue.\n"); enum Shmemq_Error shmemq_error; - struct Shmemq *shmemq = shmemq_new("/buffer1", false, &shmemq_error); + Shmemq shmemq = shmemq_new("/buffer1", false, &shmemq_error); assert(shmemq_error == SHMEMQ_ERROR_NONE); assert(shmemq != NULL); diff --git a/include/shmemq.h b/include/shmemq.h index 819acc7..f0ae38d 100644 --- a/include/shmemq.h +++ b/include/shmemq.h @@ -62,21 +62,21 @@ typedef struct Shmemq { struct Shmemq_Buffer *buffer; } *Shmemq; -struct Shmemq *shmemq_new( +Shmemq shmemq_new( const char *name, bool is_consumer, enum Shmemq_Error *error_ptr ); enum Shmemq_Error shmemq_init( - struct Shmemq *shmemq, + Shmemq shmemq, const char *name, bool is_consumer ); -enum Shmemq_Error shmemq_delete(struct Shmemq *shmemq); +enum Shmemq_Error shmemq_delete(Shmemq shmemq); -enum Shmemq_Error shmemq_finish(struct Shmemq *shmemq); +enum Shmemq_Error shmemq_finish(Shmemq shmemq); #ifdef __cplusplus } diff --git a/src/main.c b/src/main.c index 82ff875..2687d1f 100644 --- a/src/main.c +++ b/src/main.c @@ -9,14 +9,14 @@ #include #include -enum Shmemq_Error shmemq_delete(struct Shmemq *shmemq) +enum Shmemq_Error shmemq_delete(const Shmemq shmemq) { const enum Shmemq_Error error = shmemq_finish(shmemq); free(shmemq); return error; } -enum Shmemq_Error shmemq_finish(struct Shmemq *shmemq) +enum Shmemq_Error shmemq_finish(const Shmemq shmemq) { const size_t size = sizeof(struct Shmemq_BufferHeader) + @@ -35,12 +35,12 @@ enum Shmemq_Error shmemq_finish(struct Shmemq *shmemq) return SHMEMQ_ERROR_NONE; } -struct Shmemq *shmemq_new( +Shmemq shmemq_new( const char *const name, const bool is_consumer, enum Shmemq_Error *const error_ptr ) { - struct Shmemq *const shmemq = malloc(sizeof(*shmemq)); + const Shmemq shmemq = malloc(sizeof(*shmemq)); if (!shmemq) { if (error_ptr) *error_ptr = SHMEMQ_ERROR_FAILED_MALLOC; @@ -60,7 +60,7 @@ struct Shmemq *shmemq_new( } enum Shmemq_Error shmemq_init( - struct Shmemq *const shmemq, + const Shmemq shmemq, const char *const name, const bool is_consumer ) {