Merge pull request #66 from ronnychevalier/rc/warnings

Fix warnings in tectonic/

Author: pkgw

build.rs

@@ -245,6 +245,7 @@ fn main() {
         .file("tectonic/xetexini.c")
         .file("tectonic/XeTeX_pic.c")
         .define("HAVE_GETENV", Some("1"))
+        .define("HAVE_INTTYPES_H", Some("1"))
         .define("HAVE_LIBPNG", Some("1"))
         .define("HAVE_MKSTEMP", Some("1"))
         .define("HAVE_STDINT_H", Some("1"))

tectonic/TECkit_Engine.h

@@ -208,7 +208,7 @@ TECkit_GetMappingFlags(
 */
 UInt32
 WINAPI EXPORTED
-TECkit_GetVersion();
+TECkit_GetVersion(void);
 
 /*
 	***** New APIs for version 2.1 of the engine *****

tectonic/XeTeXFontInst.cpp

@@ -335,8 +335,8 @@ XeTeXFontInst::initialize(const char* pathname, int index, int &status)
 
     size_t sz = ttstub_input_get_size (handle);
     FT_Byte *data = (FT_Byte *) xmalloc (sz);
-
-    if (ttstub_input_read (handle, data, sz) != sz)
+    size_t r = ttstub_input_read (handle, data, sz);
+    if (r < 0 || (size_t) r != sz)
         _tt_abort("failed to read font file");
     ttstub_input_close(handle);
 
@@ -363,10 +363,10 @@ XeTeXFontInst::initialize(const char* pathname, int index, int &status)
         free (afm);
 
         if (afm_handle != NULL) {
-            size_t sz = ttstub_input_get_size (afm_handle);
-            FT_Byte *data = (FT_Byte *) xmalloc (sz);
-
-            if (ttstub_input_read (afm_handle, data, sz) != sz)
+            sz = ttstub_input_get_size (afm_handle);
+            data = (FT_Byte *) xmalloc (sz);
+            r = ttstub_input_read (afm_handle, data, sz);
+            if (r < 0 || (size_t) r != sz)
                 _tt_abort("failed to read AFM file");
             ttstub_input_close(afm_handle);
 

tectonic/XeTeXLayoutInterface.h

@@ -44,7 +44,7 @@ extern char gPrefEngine;
 int getCachedGlyphBBox(uint16_t fontID, uint16_t glyphID, GlyphBBox* bbox);
 void cacheGlyphBBox(uint16_t fontID, uint16_t glyphID, const GlyphBBox* bbox);
 
-void terminate_font_manager();
+void terminate_font_manager(void);
 
 XeTeXFont createFont(PlatformFontRef fontRef, Fixed pointSize);
 XeTeXFont createFontFromFile(const char* filename, int index, Fixed pointSize);
@@ -53,7 +53,7 @@ void setFontLayoutDir(XeTeXFont font, int vertical);
 
 PlatformFontRef findFontByName(const char* name, char* var, double size);
 
-char getReqEngine();
+char getReqEngine(void);
 void setReqEngine(char reqEngine);
 const char* getFullName(PlatformFontRef fontRef);
 

tectonic/XeTeX_ext.h

@@ -159,7 +159,6 @@ unsigned int read_rgb_a(const char** cp);
 int count_pdf_file_pages(void);
 int find_pic_file(char** path, real_rect* bounds, int pdfBoxType, int page);
 
-void terminate_font_manager(void);
 int maketexstring(const char* s);
 extern void set_cp_code(int fontNum, unsigned int code, int side, int value);
 extern int get_cp_code(int fontNum, unsigned int code, int side);

tectonic/bibtex.c

@@ -75,7 +75,7 @@ peekable_getc (peekable_input_t *peekable)
     return rv;
 }
 
-static int
+static void
 peekable_ungetc (peekable_input_t *peekable, int c)
 {
     /* TODO: assert c != EOF */
@@ -6517,7 +6517,7 @@ void get_bib_command_or_entry_and_process(void)
         }
         if ((right_outer_delim == 41 /*right_paren */ )) {
             if ((scan1_white(44 /*comma */ ))) ;
-        } else if ((scan2_white(44 /*comma */ , 125 /*right_brace */ ))) ;
+        } else if ((scan2_white(44 /*comma */ , 125 /*right_brace */ ))) {};
         {
             ;
 

tectonic/core-bridge.c

@@ -4,9 +4,11 @@
 */
 
 #include <tectonic/core-bridge.h>
+#include <tectonic/internals.h>
 
 #include <stdio.h> /*vsnprintf*/
 #include <stdarg.h>
+#include <stdlib.h>
 #include <setjmp.h>
 
 
@@ -34,7 +36,7 @@ _tt_abort(const_string format, ...)
     longjmp(jump_buffer, 1);
 }
 
-const const_string
+const_string
 tt_get_error_message(void)
 {
     return error_buf;
@@ -69,7 +71,7 @@ dvipdfmx_simple_main(tt_bridge_api_t *api, char *dviname, char *pdfname)
 {
     extern int dvipdfmx_main(int argc, char *argv[]);
 
-    char *argv[] = { "dvipdfmx", "-o", pdfname, dviname };
+    char *argv[] = { xstrdup("dvipdfmx"), xstrdup("-o"), pdfname, dviname };
     int rv;
 
     tectonic_global_bridge = api;
@@ -81,6 +83,10 @@ dvipdfmx_simple_main(tt_bridge_api_t *api, char *dviname, char *pdfname)
 
     rv = dvipdfmx_main(4, argv);
     tectonic_global_bridge = NULL;
+
+    free(argv[0]);
+    free(argv[1]);
+
     return rv;
 }
 

tectonic/core-bridge.h

@@ -119,7 +119,7 @@ BEGIN_EXTERN_C
 /* These functions are not meant to be used in the C/C++ code. They define the
  * API that we expose to the Rust side of things. */
 
-extern const const_string tt_get_error_message(void);
+extern const_string tt_get_error_message(void);
 extern int tex_simple_main(tt_bridge_api_t *api, char *dump_name, char *input_file_name);
 extern int dvipdfmx_simple_main(tt_bridge_api_t *api, char *dviname, char *pdfname);
 extern int bibtex_simple_main(tt_bridge_api_t *api, char *aux_file_name);

tectonic/dpx-bmpimage.c

@@ -140,7 +140,7 @@ bmp_include_image (pdf_ximage *ximage, rust_input_handle_t handle)
     if (hdr.bit_count < 24) {
         if (hdr.bit_count != 1 &&
             hdr.bit_count != 4 && hdr.bit_count != 8) {
-            dpx_warning("Unsupported palette size: %ld", hdr.bit_count);
+            dpx_warning("Unsupported palette size: %hu", hdr.bit_count);
             return -1;
         }
         num_palette = (hdr.offset - hdr.hsize - DIB_FILE_HEADER_SIZE) / hdr.psize;
@@ -151,12 +151,12 @@ bmp_include_image (pdf_ximage *ximage, rust_input_handle_t handle)
         info.bits_per_component = 8;
         info.num_components = 3;
     } else {
-        dpx_warning("Unkown/Unsupported BMP bitCount value: %ld", hdr.bit_count);
+        dpx_warning("Unkown/Unsupported BMP bitCount value: %hu", hdr.bit_count);
         return -1;
     }
 
     if (info.width == 0 || info.height == 0 || num_palette < 1) {
-        dpx_warning("Invalid BMP file: width=%ld, height=%ld, #palette=%d",
+        dpx_warning("Invalid BMP file: width=%u, height=%d, #palette=%d",
                     info.width, info.height, num_palette);
         return -1;
     }
@@ -236,7 +236,7 @@ bmp_include_image (pdf_ximage *ximage, rust_input_handle_t handle)
                 return -1;
             }
         } else {
-            dpx_warning("Unknown/Unsupported compression type for BMP image: %ld", hdr.compression);
+            dpx_warning("Unknown/Unsupported compression type for BMP image: %d", hdr.compression);
             pdf_release_obj(stream);
             return -1;
         }

tectonic/dpx-cidtype0.c

@@ -817,7 +817,7 @@ CIDFont_type0_dofont (CIDFont *font)
     CIDFontInfo_close(&info);
 
     if (verbose > 1)
-        dpx_message("[%u/%u glyphs][%ld bytes]", num_glyphs, cs_count, destlen);
+        dpx_message("[%u/%u glyphs][%d bytes]", num_glyphs, cs_count, destlen);
 
     CIDFont_type0_add_CIDSet(font, used_chars, last_cid);
 }
@@ -1272,7 +1272,7 @@ CIDFont_type0_t1cdofont (CIDFont *font)
     CIDFontInfo_close(&info);
 
     if (verbose > 1)
-        dpx_message("[%u glyphs][%ld bytes]", num_glyphs, destlen);
+        dpx_message("[%u glyphs][%d bytes]", num_glyphs, destlen);
 
     CIDFont_type0_add_CIDSet(font, used_chars, last_cid);
 }