Merge pull request #1798 from CEED/jeremy/xskd-tidy

tidy - minor fixes

Author: jeremylt

Makefile

@@ -957,7 +957,7 @@ vermin    :
 CLANG_TIDY ?= clang-tidy
 
 %.c.tidy : %.c
-	$(CLANG_TIDY) $(TIDY_OPTS) $^ -- $(CPPFLAGS) --std=c99 -I$(CUDA_DIR)/include -I$(ROCM_DIR)/include -DCEED_JIT_SOURCE_ROOT_DEFAULT="\"$(abspath ./include)/\""
+	$(CLANG_TIDY) $(TIDY_OPTS) $^ -- $(CPPFLAGS) --std=c99 -I$(CUDA_DIR)/include -I$(ROCM_DIR)/include -DCEED_JIT_SOURCE_ROOT_DEFAULT="\"$(abspath ./include)/\"" -DCEED_GIT_VERSION="\"$(GIT_DESCRIBE)\"" -DCEED_BUILD_CONFIGURATION="\"// Build Configuration:$(foreach v,$(CONFIG_VARS),\n$(v) = $($(v)))\""
 
 %.cpp.tidy : %.cpp
 	$(CLANG_TIDY) $(TIDY_OPTS) $^ -- $(CPPFLAGS) --std=c++11 -I$(CUDA_DIR)/include -I$(OCCA_DIR)/include -I$(ROCM_DIR)/include

interface/ceed-config.c

@@ -14,39 +14,39 @@ const char *CeedBuildConfiguration = CEED_BUILD_CONFIGURATION;
 /// @{
 
 /**
-  @brief Get output of `git describe --dirty` from build time
+  @brief Get output of `git describe --dirty` from build time.
 
-  While @ref CeedGetVersion() uniqely identifies the source code for release
+  While @ref CeedGetVersion() uniquely identifies the source code for release
   builds, it does not identify builds from other commits.
 
   @param[out] git_version A static string containing the Git commit description.
 
   If `git describe --always --dirty` fails, the string `"unknown"` will be provided.
   This could occur if Git is not installed or if libCEED is not being built from a repository, for example.`
 
-  @return An error code: 0 - success, otherwise - failure
-
   @ref Developer
 
   @sa CeedGetVersion() CeedGetBuildConfiguration()
+
+  @return An error code: 0 - success, otherwise - failure
 */
 int CeedGetGitVersion(const char **git_version) {
   *git_version = CeedGitVersion;
   return CEED_ERROR_SUCCESS;
 }
 
 /**
-  @brief Get build variables as a multi-line string
+  @brief Get build variables as a multi-line string.
 
   Each line of the string has the format `VARNAME = value`.
 
   @param[out] build_config A static string containing build variables
 
-  @return An error code: 0 - success, otherwise - failure
-
   @ref Developer
 
   @sa CeedGetVersion() CeedGetGitVersion()
+
+  @return An error code: 0 - success, otherwise - failure
 */
 int CeedGetBuildConfiguration(const char **build_config) {
   *build_config = CeedBuildConfiguration;

interface/ceed-jit-tools.c

@@ -137,9 +137,15 @@ int CeedLoadSourceToInitializedBuffer(Ceed ceed, const char *source_file_path, C
   // -- Compute size of source
   fseek(source_file, 0L, SEEK_END);
   file_size = ftell(source_file);
-  rewind(source_file);
+  fseek(source_file, 0L, SEEK_SET);
   //  -- Allocate memory for entire source file
-  CeedCall(CeedCalloc(file_size + 1, &temp_buffer));
+  {
+    const int ierr = CeedCalloc(file_size + 1, &temp_buffer);
+
+    // Close stream before error handling, if necessary
+    if (ierr != CEED_ERROR_SUCCESS) fclose(source_file);
+    CeedCall(ierr);
+  }
   // -- Copy the file into the buffer
   if (1 != fread(temp_buffer, file_size, 1, source_file)) {
     // LCOV_EXCL_START