From 09321c8d9d972b1bfb568d570fad4e5cc9dd1dc6 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 5 Aug 2018 01:34:56 -0400 Subject: driver, unit context: remove input-mapping interfaces which are not needed. --- include/apimagic/apimagic.h | 10 ------ project/common.mk | 1 - src/internal/apimagic_driver_impl.h | 1 - src/logic/amgc_map_input.c | 62 ------------------------------------- 4 files changed, 74 deletions(-) delete mode 100644 src/logic/amgc_map_input.c diff --git a/include/apimagic/apimagic.h b/include/apimagic/apimagic.h index cbd15c5..ceda5c9 100644 --- a/include/apimagic/apimagic.h +++ b/include/apimagic/apimagic.h @@ -78,11 +78,6 @@ enum amgc_output_action { AMGC_LIST_FUNCTION, }; -struct amgc_input { - void * addr; - size_t size; -}; - struct amgc_source_version { int major; int minor; @@ -180,7 +175,6 @@ struct amgc_unit_entities { struct amgc_unit_ctx { const char * const * path; - const struct amgc_input * map; const struct amgc_common_ctx * cctx; const struct amgc_unit_meta * meta; const struct amgc_unit_entities*entities; @@ -320,10 +314,6 @@ amgc_api int amgc_output_union (const struct amgc_driver_ctx *, amgc_api int amgc_output_error_record (const struct amgc_driver_ctx *, const struct amgc_error_info *); amgc_api int amgc_output_error_vector (const struct amgc_driver_ctx *); -/* raw input api */ -amgc_api int amgc_map_input (const struct amgc_driver_ctx *, int fd, const char * path, int prot, struct amgc_input *); -amgc_api int amgc_unmap_input (struct amgc_input *); - /* low-level api */ amgc_api int amgc_init_unit_meta (const struct amgc_unit_ctx *, struct amgc_unit_meta *); diff --git a/project/common.mk b/project/common.mk index c6a7dd8..c0bd25c 100644 --- a/project/common.mk +++ b/project/common.mk @@ -6,7 +6,6 @@ API_SRCS = \ src/driver/amgc_unit_ctx.c \ src/logic/amgc_enum_members.c \ src/logic/amgc_init_unit_meta.c \ - src/logic/amgc_map_input.c \ src/logic/amgc_unit_entities.c \ src/output/amgc_output_compound.c \ src/output/amgc_output_entities.c \ diff --git a/src/internal/apimagic_driver_impl.h b/src/internal/apimagic_driver_impl.h index a50a2ec..3e34c59 100644 --- a/src/internal/apimagic_driver_impl.h +++ b/src/internal/apimagic_driver_impl.h @@ -47,7 +47,6 @@ struct amgc_driver_ctx_impl { struct amgc_unit_ctx_impl { const struct amgc_driver_ctx * dctx; const char * path; - struct amgc_input map; struct amgc_common_ctx cctx; struct amgc_unit_ctx uctx; struct amgc_unit_meta meta; diff --git a/src/logic/amgc_map_input.c b/src/logic/amgc_map_input.c deleted file mode 100644 index c0d4a2b..0000000 --- a/src/logic/amgc_map_input.c +++ /dev/null @@ -1,62 +0,0 @@ -/**********************************************************/ -/* apimagic: cparser-based API normalization utility */ -/* Copyright (C) 2015--2016 Z. Gilboa */ -/* Released under GPLv2 and GPLv3; see COPYING.APIMAGIC. */ -/**********************************************************/ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include "apimagic_errinfo_impl.h" - -int amgc_map_input( - const struct amgc_driver_ctx * dctx, - int fd, - const char * path, - int prot, - struct amgc_input * map) -{ - struct stat st; - bool fnew; - int ret; - - if ((fnew = (fd < 0))) - fd = open(path,O_RDONLY | O_CLOEXEC); - - if (fd < 0) - return AMGC_SYSTEM_ERROR(dctx); - - if ((ret = fstat(fd,&st) < 0) && fnew) - close(fd); - - else if ((st.st_size == 0) && fnew) - close(fd); - - if (ret < 0) - return AMGC_SYSTEM_ERROR(dctx); - - else if (st.st_size == 0) - return AMGC_CUSTOM_ERROR( - dctx,AMGC_ERR_SOURCE_SIZE_ZERO); - - map->size = st.st_size; - map->addr = mmap(0,map->size,prot,MAP_PRIVATE,fd,0); - - if (fnew) - close(fd); - - return (map->addr == MAP_FAILED) - ? AMGC_SYSTEM_ERROR(dctx) - : 0; -} - -int amgc_unmap_input(struct amgc_input * map) -{ - return munmap(map->addr,map->size); -} -- cgit v1.2.3