mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up clang-reported issue: dead assignment.

Browse Source
This commit is contained in:
Ward Fisher 2014-04-21 10:56:57 -06:00
parent a4f6cfa1c3
commit 52b2edab9b
2 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ncgen/CMakeLists.txt
View File

@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(".")
SET(ncgen_FILES generate.c main.c cdata.c bindata.c genchar.c cvt.c data.c debug.c escapes.c genc.c genbin.c generr.c genlib.c getfill.c odom.c offsets.c semantics.c ncgentab.c dump.c util.c bytebuffer.c list.c genf77.c f77data.c genj.c jdata.c nc_iter.c ConvertUTF.c )
IF(USE_X_GETOPT)
SET(ncgen_FILES ${ncgen_FILES} XGetopt.c)
SET(ncgen_FILES ${ncgen_FILES} XGetopt.c)
ENDIF()
ADD_EXECUTABLE(ncgen ${ncgen_FILES})
@ -19,38 +19,36 @@ FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
# Stuff to build if tests are enabled.
IF(ENABLE_TESTS)
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
add_sh_test(ncgen run_tests)
#ADD_TEST(run_ncgen_tests sh ${CMAKE_CURRENT_BINARY_DIR}/run_tests.sh)
IF(USE_NETCDF4)
#ADD_TEST(run_ncgen_nc4_tests sh ${CMAKE_CURRENT_BINARY_DIR}/run_nc4_tests.sh)
add_sh_test(ncgen run_nc4_tests)
ENDIF()
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
add_sh_test(ncgen run_tests)
IF(USE_NETCDF4)
add_sh_test(ncgen run_nc4_tests)
ENDIF()
ENDIF()
SET(MAN_FILES ncgen.1)
IF(NOT MSVC)
INSTALL(FILES ${MAN_FILES} DESTINATION "share/man/man1"
COMPONENT documentation)
INSTALL(FILES ${MAN_FILES} DESTINATION "share/man/man1"
COMPONENT documentation)
ENDIF()
SET(CLEANFILES c0.nc c0_64.nc c0_4.nc c0_4c.nc ref_camrun.c)
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")
ADD_CUSTOM_COMMAND(
OUTPUT ncgentab.h
COMMAND flex -Pncg -B ncgen.l
COMMAND rm -f ncgenyy.c
COMMAND mv lex.ncg.c ncgenyy.c
COMMAND bison -pncg -t -d ncgen.y
COMMAND rm -f ncgentab.c ncgentab.h
COMMAND mv ncgen.tab.c ncgentab.c
COMMAND mv ncgen.tab.h ncgentab.h
COMMAND mv ncgentab.h ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND mv ncgentab.c ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND mv ncgenyy.c ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT ncgentab.h
COMMAND flex -Pncg -B ncgen.l
COMMAND rm -f ncgenyy.c
COMMAND mv lex.ncg.c ncgenyy.c
COMMAND bison -pncg -t -d ncgen.y
COMMAND rm -f ncgentab.c ncgentab.h
COMMAND mv ncgen.tab.c ncgentab.c
COMMAND mv ncgen.tab.h ncgentab.h
COMMAND mv ncgentab.h ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND mv ncgentab.c ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND mv ncgenyy.c ${CMAKE_CURRENT_SOURCE_DIR}
)
)
ADD_CUSTOM_TARGET(makeparser DEPENDS ncgentab.h)

7
ncgen/genj.c
View File

@ -519,11 +519,8 @@ genj_writeattr(Generator* generator, Symbol* asym, Bytebuffer* code,
{
Symbol* basetype = asym->typ.basetype;
nc_type typecode = basetype->typ.typecode;
size_t len = asym->data->length; /* default assumption */
Datalist* list;
list = asym->data;
len = list == NULL?0:list->length;
/* default assumption */
size_t len = asym->data == NULL?0:asym->data->length;
codeprintf("%s/* attribute: %s */\n",indented(1),asym->name);