* src/preproc/html/pre-html.cc (scanArguments): Use `troff_command'

instead of hardwired `"troff"'.
(char_buffer::read_file): Remove unused variables.
(char_buffer::write_file_troff): Ditto.
(char_buffer::write_file_html): Ditto.
(generateImages): Ditto.
(abs): Removed.
* src/utils/addftinfo/addftinfo.cc (main): Fix compilation problem.

* src/include/lib.h: Don't include `groff-getopt.h' for UWIN.

* src/libs/libgroff/font.cc (font::load_desc): Fix compiler warning.
* src/libs/libbib/index.cc (index_search_item_iterator::get_tag,
index_search_item::search1): Ditto.
* src/roff/troff/node.h (width_list): Reorder members.
* src/roff/troff/input.cc (do_define_macro): Fix compiler warning.
(lookup_warning): Ditto.
(prepend_string): Commented out.
* src/roff/troff/dictionary.cc (is_good_size): Fix compiler warning.
* src/roff/troff/reg.cc (number_value_to_ascii): Ditto.
* src/preproc/tbl/main.cc (process_format): Ditto.
* src/preproc/pic/pic.y (define_variable, reset, reset_all): Fix
compiler warnings.
* src/preproc/pic/pic.cc: Updated.
* src/preproc/eqn/lex.cc (init_table): Fix compiler warnings.
* src/preproc/eqn/over.cc (over_box::compute_metrics): Ditto.
* src/preproc/refer/command.cc (execute_command): Ditto.
* src/preproc/refer/ref.cc (sortify_title, find_month): Ditto.
* src/preproc/refer/token.cc (lookup_token): Ditto.
* src/preproc/soelim/soelim.cc: Ditto.
* src/preproc/html/pushbackbuffer.cc (ERROR): Ditto.
(isHexDigit): Commented out.
(pushBackBuffer::isString): Remove unused variable.
* src/devices/grops/ps.cc (ps_printer::special): Fix compiler
warning.
* src/devices/grops/psrm.cc (resource_manager::lookup_font,
resource_manager::read_resource_arg, read_one_of, parse_extensions):
Ditto.
* src/devices/grodvi/dvi.cc (dvi_printer::draw): Ditto.
* src/devices/grolj4/lj4.cc (lj4_font::handle_unknown_font_command,
lookup_paper_size): Ditto.
* src/devices/grohtml/post-html.cc (is_subsection): Commented out.
(text_glob, element_list): Reorder members.
* src/devices/grohtml/html-text.cc (html_text::do_pre): Remove
compiler warning.
* src/devices/grohtml/html-text.h (html_text::emit_space): Change
return value to `void'.
* src/devices/grohtml/output.cc (word_list::word_list): Fix order
of initializers.
* src/devices/grohtml/html.h (simple_output::check_newline,
simple_output::space_or_newline, simple_output::enable_newlines):
Add return value.
* src/devices/grolbp/lbp.cc (wp54charset, set_papersize): Remove
compiler warnings.
* src/utils/tfmtodit/tfmtodit.cc (tfm::load, gf::load, main): Ditto.
* src/utils/hpftodit/hpftodit.cc (File::seek, read_symbol_sets,
output_ligatures, output_charset, read_map): Ditto.
* src/utils/lookbib/lookbib.cc (main): Ditto.
* src/utils/indxbib/indxbib.cc (main, fwrite_or_die): Ditto.
(do_file): Fix typo (`=' -> `==').
* src/utils/lkbib/lkbib.cc (main): Remove compiler warning.
* src/utils/addftinfo/addftinfo.cc (main): Ditto.

6 files changed, 22 insertions, 21 deletions

diff --git a/src/utils/addftinfo/addftinfo.cc b/src/utils/addftinfo/addftinfo.cc
index 43a81bcb..69fb8d48 100644
--- a/src/utils/addftinfo/addftinfo.cc
+++ b/src/utils/addftinfo/addftinfo.cc
@@ -67,7 +67,8 @@ static struct {
 int main(int argc, char **argv)
 {
   program_name = argv[0];
-  for (int i = 1; i < argc; i++) {
+  int i;
+  for (i = 1; i < argc; i++) {
     if (!strcmp(argv[i], "-v") || !strcmp(argv[i],"--version"))
       version();
     if (!strcmp(argv[i],"--help")) {
@@ -99,7 +100,6 @@ int main(int argc, char **argv)
   param.comma_depth = DEFAULT_COMMA_DEPTH;
   param.desc_depth = DEFAULT_DESC_DEPTH;
   param.body_depth = DEFAULT_BODY_DEPTH;
-  int i;
   for (i = 1; i < argc && argv[i][0] == '-'; i++) {
     if (argv[i][1] == '-' && argv[i][2] == '\0') {
       i++;
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
     }
     if (i + 1 >= argc)
       usage();
-    int j;
+    size_t j;
     for (j = 0;; j++) {
       if (j >= sizeof(param_table)/sizeof(param_table[0]))
 	fatal("parameter `%1' not recognized", argv[i] + 1);
diff --git a/src/utils/hpftodit/hpftodit.cc b/src/utils/hpftodit/hpftodit.cc
index f81f5ad8..3034847a 100644
--- a/src/utils/hpftodit/hpftodit.cc
+++ b/src/utils/hpftodit/hpftodit.cc
@@ -163,10 +163,10 @@ entry tags[max_tag + 1 - min_tag];
 char_info *char_table;
 uint32 nchars;
 
-int msl_name_table_size = 0;
+unsigned int msl_name_table_size = 0;
 name_list **msl_name_table = 0;
 
-int n_symbol_sets;
+unsigned int n_symbol_sets;
 symbol_set *symbol_set_table;
 
 static int special_flag = 0;
@@ -337,7 +337,7 @@ void File::skip(int n)
 
 void File::seek(uint32 n)
 {
-  if (end_ - buf_ < n)
+  if ((uint32)(end_ - buf_) < n)
     fatal("unexpected end of file");
   ptr_ = buf_ + n;
 }
@@ -437,7 +437,7 @@ void read_symbol_sets(File &f)
   uint32 symbol_set_dir_length = tag_info(symbol_set_tag).count;
   n_symbol_sets = symbol_set_dir_length/14;
   symbol_set_table = new symbol_set[n_symbol_sets];
-  int i;
+  unsigned int i;
   for (i = 0; i < n_symbol_sets; i++) {
     f.seek(tag_info(symbol_set_tag).value + i*14);
     (void)f.get_uint32();
@@ -445,7 +445,7 @@ void read_symbol_sets(File &f)
     uint32 off2 = f.get_uint32();
     (void)f.get_uint16();		// what's this for?
     f.seek(off1);
-    int j;
+    unsigned int j;
     uint16 kind = 0;
     for (j = 0; j < off2 - off1; j++) {
       unsigned char c = f.get_byte();
@@ -465,7 +465,7 @@ void read_symbol_sets(File &f)
 				  ? special_symbol_sets
 				  : text_symbol_sets);
   for (i = 0; symbol_set_selectors[i] != 0; i++) {
-    int j;
+    unsigned int j;
     for (j = 0; j < n_symbol_sets; j++)
       if (symbol_set_table[j].select == symbol_set_selectors[i])
 	break;
@@ -610,13 +610,13 @@ void output_ligatures()
     };
   
   unsigned ligature_mask = 0;
-  int i;
+  unsigned int i;
   for (i = 0; i < nchars; i++) {
     uint16 msl = char_table[i].msl;
     if (msl < msl_name_table_size
 	&& char_table[i].symbol_set != NO_SYMBOL_SET) {
       for (name_list *p = msl_name_table[msl]; p; p = p->next)
-	for (int j = 0; j < SIZEOF(ligature_chars); j++)
+	for (unsigned int j = 0; j < SIZEOF(ligature_chars); j++)
 	  if (strcmp(p->name, ligature_chars[j]) == 0) {
 	    ligature_mask |= 1 << j;
 	    break;
@@ -671,7 +671,7 @@ void output_charset()
   require_tag(lower_descent_tag);
 
   printf("charset\n");
-  int i;
+  unsigned int i;
   for (i = 0; i < nchars; i++) {
     uint16 msl = char_table[i].msl;
     if (msl < msl_name_table_size
diff --git a/src/utils/indxbib/indxbib.cc b/src/utils/indxbib/indxbib.cc
index 99a6baf4..ee4543b5 100644
--- a/src/utils/indxbib/indxbib.cc
+++ b/src/utils/indxbib/indxbib.cc
@@ -232,7 +232,8 @@ int main(int argc, char **argv)
   else
     name_max = dir_name_max(".");
   const char *filename = p ? p + 1 : basename;
-  if (name_max >= 0 && strlen(filename) + sizeof(INDEX_SUFFIX) - 1 > name_max)
+  if (name_max >= 0 &&
+      long(strlen(filename) + sizeof(INDEX_SUFFIX) - 1) > name_max)
     fatal("`%1.%2' is too long for a filename", filename, INDEX_SUFFIX);
   if (p) {
     p++;
@@ -502,7 +503,7 @@ static int do_file(const char *filename)
     // every CR character before a Newline.
     if (c == '\r') {
       int peek = getc(fp);
-      if (peek = '\n') {
+      if (peek == '\n') {
 	byte_count++;
 	c = peek;
       }
@@ -784,7 +785,7 @@ static void write_hash_table()
 
 static void fwrite_or_die(const void *ptr, int size, int nitems, FILE *fp)
 {
-  if (fwrite(ptr, size, nitems, fp) != nitems)
+  if (fwrite(ptr, size, nitems, fp) != (size_t)nitems)
     fatal("fwrite failed: %1", strerror(errno));
 }
 
diff --git a/src/utils/lkbib/lkbib.cc b/src/utils/lkbib/lkbib.cc
index 4d3cadcb..ee6b05ed 100644
--- a/src/utils/lkbib/lkbib.cc
+++ b/src/utils/lkbib/lkbib.cc
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
   int len;
   int count;
   for (count = 0; iter.next(&start, &len); count++) {
-    if (fwrite(start, 1, len, stdout) != len)
+    if (fwrite(start, 1, len, stdout) != (size_t)len)
       fatal("write error on stdout: %1", strerror(errno));
     // Can happen for last reference in file.
     if (start[len - 1] != '\n')
diff --git a/src/utils/lookbib/lookbib.cc b/src/utils/lookbib/lookbib.cc
index dc55ed93..103cd0b5 100644
--- a/src/utils/lookbib/lookbib.cc
+++ b/src/utils/lookbib/lookbib.cc
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
     int len;
     int count;
     for (count = 0; iter.next(&start, &len); count++) {
-      if (fwrite(start, 1, len, stdout) != len)
+      if (fwrite(start, 1, len, stdout) != (size_t)len)
 	fatal("write error on stdout: %1", strerror(errno));
       // Can happen for last reference in file.
       if (start[len - 1] != '\n')
diff --git a/src/utils/tfmtodit/tfmtodit.cc b/src/utils/tfmtodit/tfmtodit.cc
index 96768d2b..cb505e45 100644
--- a/src/utils/tfmtodit/tfmtodit.cc
+++ b/src/utils/tfmtodit/tfmtodit.cc
@@ -289,7 +289,7 @@ int tfm::load(const char *file)
   int lf = (c1 << 8) + c2;
   int toread = lf*4 - 2;
   unsigned char *buf = new unsigned char[toread];
-  if (fread(buf, 1, toread, fp) != toread) {
+  if (fread(buf, 1, toread, fp) != (size_t)toread) {
     if (feof(fp))
       error("unexpected end of file on `%1'", file);
     else
@@ -491,7 +491,7 @@ int gf::load(const char *file)
 	if (len == EOF)
 	  goto eof;
 	char buf[256];
-	if (fread(buf, 1, len, fp) != len)
+	if (fread(buf, 1, len, fp) != (size_t)len)
 	  goto eof;
 	if (len == 10 /* strlen("adjustment") */
 	    && memcmp(buf, "adjustment", len) == 0) {
@@ -786,12 +786,12 @@ int main(int argc, char **argv)
   int xheight;
   if (!t.get_param(5, &xheight))
     xheight = 0;
-  int i;
+  unsigned int i;
   // Print the list of ligatures.
   // First find the indices of each character that can participate in
   // a ligature.
   for (i = 0; i < 256; i++)
-    for (int j = 0; j < sizeof(lig_chars)/sizeof(lig_chars[0]); j++)
+    for (unsigned int j = 0; j < sizeof(lig_chars)/sizeof(lig_chars[0]); j++)
       for (char_list *p = table[i]; p; p = p->next)
 	if (strcmp(lig_chars[j].ch, p->ch) == 0)
 	  lig_chars[j].i = i;