[hfst] 01/01: Return value of getopt is int, not char - fixes problems on platforms with unsigned char
Tino Didriksen
tinodidriksen-guest at moszumanska.debian.org
Sat Jun 11 16:22:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
tinodidriksen-guest pushed a commit to branch master
in repository hfst.
commit d6b78cd0b619a22999e6e6944a00ce0211cdaf4d
Author: Tino Didriksen <tino at didriksen.cc>
Date: Sat Jun 11 16:22:44 2016 +0000
Return value of getopt is int, not char - fixes problems on platforms with unsigned char
---
debian/patches/hfst_03_char2int.diff | 852 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 853 insertions(+)
diff --git a/debian/patches/hfst_03_char2int.diff b/debian/patches/hfst_03_char2int.diff
new file mode 100644
index 0000000..f4fa0df
--- /dev/null
+++ b/debian/patches/hfst_03_char2int.diff
@@ -0,0 +1,852 @@
+Index: tools/src/hfst-affix-guessify.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-affix-guessify.cc b/trunk/tools/src/hfst-affix-guessify.cc
+--- a/trunk/tools/src/hfst-affix-guessify.cc (revision 2798)
++++ b/trunk/tools/src/hfst-affix-guessify.cc (working copy)
+@@ -111,7 +111,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT
+ "w:D:",
+ long_options, &option_index);
+Index: tools/src/hfst-binary-tool.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-binary-tool.cc b/trunk/tools/src/hfst-binary-tool.cc
+--- a/trunk/tools/src/hfst-binary-tool.cc (revision 2798)
++++ b/trunk/tools/src/hfst-binary-tool.cc (working copy)
+@@ -78,7 +78,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_BINARY_SHORT,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-compare.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-compare.cc b/trunk/tools/src/hfst-compare.cc
+--- a/trunk/tools/src/hfst-compare.cc (revision 2798)
++++ b/trunk/tools/src/hfst-compare.cc (working copy)
+@@ -103,7 +103,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_BINARY_SHORT "He",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-compiler.yy
+===================================================================
+diff --git a/trunk/tools/src/hfst-compiler.yy b/trunk/tools/src/hfst-compiler.yy
+--- a/trunk/tools/src/hfst-compiler.yy (revision 2798)
++++ b/trunk/tools/src/hfst-compiler.yy (working copy)
+@@ -327,7 +327,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "f:Hw",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-compose-intersect.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-compose-intersect.cc b/trunk/tools/src/hfst-compose-intersect.cc
+--- a/trunk/tools/src/hfst-compose-intersect.cc (revision 2798)
++++ b/trunk/tools/src/hfst-compose-intersect.cc (working copy)
+@@ -119,7 +119,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_BINARY_SHORT "FIeHfa",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-compose.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-compose.cc b/trunk/tools/src/hfst-compose.cc
+--- a/trunk/tools/src/hfst-compose.cc (revision 2798)
++++ b/trunk/tools/src/hfst-compose.cc (working copy)
+@@ -105,7 +105,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_BINARY_SHORT "FHx:X:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-concatenate.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-concatenate.cc b/trunk/tools/src/hfst-concatenate.cc
+--- a/trunk/tools/src/hfst-concatenate.cc (revision 2798)
++++ b/trunk/tools/src/hfst-concatenate.cc (working copy)
+@@ -96,7 +96,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_BINARY_SHORT "FH",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-conjunct.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-conjunct.cc b/trunk/tools/src/hfst-conjunct.cc
+--- a/trunk/tools/src/hfst-conjunct.cc (revision 2798)
++++ b/trunk/tools/src/hfst-conjunct.cc (working copy)
+@@ -95,7 +95,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_BINARY_SHORT "FH",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-determinize.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-determinize.cc b/trunk/tools/src/hfst-determinize.cc
+--- a/trunk/tools/src/hfst-determinize.cc (revision 2798)
++++ b/trunk/tools/src/hfst-determinize.cc (working copy)
+@@ -92,7 +92,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "E",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-disjunct.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-disjunct.cc b/trunk/tools/src/hfst-disjunct.cc
+--- a/trunk/tools/src/hfst-disjunct.cc (revision 2798)
++++ b/trunk/tools/src/hfst-disjunct.cc (working copy)
+@@ -94,7 +94,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_BINARY_SHORT "H",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-edit-metadata.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-edit-metadata.cc b/trunk/tools/src/hfst-edit-metadata.cc
+--- a/trunk/tools/src/hfst-edit-metadata.cc (revision 2798)
++++ b/trunk/tools/src/hfst-edit-metadata.cc (working copy)
+@@ -106,7 +106,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "a:p::t:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-expand-equivalences.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-expand-equivalences.cc b/trunk/tools/src/hfst-expand-equivalences.cc
+--- a/trunk/tools/src/hfst-expand-equivalences.cc (revision 2798)
++++ b/trunk/tools/src/hfst-expand-equivalences.cc (working copy)
+@@ -119,7 +119,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "f:t:a:T:l:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-flookup.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-flookup.cc b/trunk/tools/src/hfst-flookup.cc
+--- a/trunk/tools/src/hfst-flookup.cc (revision 2798)
++++ b/trunk/tools/src/hfst-flookup.cc (working copy)
+@@ -336,7 +336,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "I:O:F:xc:X:e:E:b:t:p::PRf",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-format.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-format.cc b/trunk/tools/src/hfst-format.cc
+--- a/trunk/tools/src/hfst-format.cc (revision 2798)
++++ b/trunk/tools/src/hfst-format.cc (working copy)
+@@ -94,7 +94,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "1:2:lt:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-fst2fst.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-fst2fst.cc b/trunk/tools/src/hfst-fst2fst.cc
+--- a/trunk/tools/src/hfst-fst2fst.cc (revision 2798)
++++ b/trunk/tools/src/hfst-fst2fst.cc (working copy)
+@@ -115,7 +115,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "SFtlOwQf:bx",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-fst2strings.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-fst2strings.cc b/trunk/tools/src/hfst-fst2strings.cc
+--- a/trunk/tools/src/hfst-fst2strings.cc (revision 2798)
++++ b/trunk/tools/src/hfst-fst2strings.cc (working copy)
+@@ -167,7 +167,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT
+ "Swb:c:e:u:p:l:L:n:r:N:U:P:X:",
+ long_options, &option_index);
+Index: tools/src/hfst-fst2txt.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-fst2txt.cc b/trunk/tools/src/hfst-fst2txt.cc
+--- a/trunk/tools/src/hfst-fst2txt.cc (revision 2798)
++++ b/trunk/tools/src/hfst-fst2txt.cc (working copy)
+@@ -121,7 +121,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "wDnf:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-getopt.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-getopt.cc b/trunk/tools/src/hfst-getopt.cc
+--- a/trunk/tools/src/hfst-getopt.cc (revision 2798)
++++ b/trunk/tools/src/hfst-getopt.cc (working copy)
+@@ -21,7 +21,7 @@
+ std::vector<char *> free_arguments;
+ std::vector<char *> other_arguments;
+
+-char getopt_long(int argc, char * /*const*/ argv [], const char * optstring,
++int getopt_long(int argc, char * /*const*/ argv [], const char * optstring,
+ const struct option * longopts, int * longindex)
+ {
+ // check that there are more args
+Index: tools/src/hfst-getopt.h
+===================================================================
+diff --git a/trunk/tools/src/hfst-getopt.h b/trunk/tools/src/hfst-getopt.h
+--- a/trunk/tools/src/hfst-getopt.h (revision 2798)
++++ b/trunk/tools/src/hfst-getopt.h (working copy)
+@@ -14,5 +14,5 @@
+ extern int optopt;
+ extern int optind;
+
+-char getopt_long(int argc, char * /*const*/ argv [], const char * optstring,
++int getopt_long(int argc, char * /*const*/ argv [], const char * optstring,
+ const struct option * longopts, int * longindex);
+Index: tools/src/hfst-grep.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-grep.cc b/trunk/tools/src/hfst-grep.cc
+--- a/trunk/tools/src/hfst-grep.cc (revision 2798)
++++ b/trunk/tools/src/hfst-grep.cc (working copy)
+@@ -267,7 +267,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT
+ "EFGPXe:f:IwxzqmbnOad:D:rLlcZA:B:C:uU9:",
+ long_options, &option_index);
+Index: tools/src/hfst-guess.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-guess.cc b/trunk/tools/src/hfst-guess.cc
+--- a/trunk/tools/src/hfst-guess.cc (revision 2798)
++++ b/trunk/tools/src/hfst-guess.cc (working copy)
+@@ -156,7 +156,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "f:m:n:g:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-guessify.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-guessify.cc b/trunk/tools/src/hfst-guessify.cc
+--- a/trunk/tools/src/hfst-guessify.cc (revision 2798)
++++ b/trunk/tools/src/hfst-guessify.cc (working copy)
+@@ -131,7 +131,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "p:G",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-head.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-head.cc b/trunk/tools/src/hfst-head.cc
+--- a/trunk/tools/src/hfst-head.cc (revision 2798)
++++ b/trunk/tools/src/hfst-head.cc (working copy)
+@@ -98,7 +98,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "n:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-info.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-info.cc b/trunk/tools/src/hfst-info.cc
+--- a/trunk/tools/src/hfst-info.cc (revision 2798)
++++ b/trunk/tools/src/hfst-info.cc (working copy)
+@@ -134,7 +134,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ "a:e:f:m:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-invert.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-invert.cc b/trunk/tools/src/hfst-invert.cc
+--- a/trunk/tools/src/hfst-invert.cc (revision 2798)
++++ b/trunk/tools/src/hfst-invert.cc (working copy)
+@@ -86,7 +86,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-lexc-compiler.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-lexc-compiler.cc b/trunk/tools/src/hfst-lexc-compiler.cc
+--- a/trunk/tools/src/hfst-lexc-compiler.cc (revision 2798)
++++ b/trunk/tools/src/hfst-lexc-compiler.cc (working copy)
+@@ -145,7 +145,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ "Ef:o:AFMRx:X:W",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-lexc-wrapper.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-lexc-wrapper.cc b/trunk/tools/src/hfst-lexc-wrapper.cc
+--- a/trunk/tools/src/hfst-lexc-wrapper.cc (revision 2798)
++++ b/trunk/tools/src/hfst-lexc-wrapper.cc (working copy)
+@@ -115,7 +115,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ "f:o:l::u::X",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-lookup.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-lookup.cc b/trunk/tools/src/hfst-lookup.cc
+--- a/trunk/tools/src/hfst-lookup.cc (revision 2798)
++++ b/trunk/tools/src/hfst-lookup.cc (working copy)
+@@ -329,7 +329,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "I:O:F:xc:X:e:E:b:t:p::P",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-minimize.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-minimize.cc b/trunk/tools/src/hfst-minimize.cc
+--- a/trunk/tools/src/hfst-minimize.cc (revision 2798)
++++ b/trunk/tools/src/hfst-minimize.cc (working copy)
+@@ -94,7 +94,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "E",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-multiply.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-multiply.cc b/trunk/tools/src/hfst-multiply.cc
+--- a/trunk/tools/src/hfst-multiply.cc (revision 2798)
++++ b/trunk/tools/src/hfst-multiply.cc (working copy)
+@@ -93,7 +93,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "n:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-name.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-name.cc b/trunk/tools/src/hfst-name.cc
+--- a/trunk/tools/src/hfst-name.cc (revision 2798)
++++ b/trunk/tools/src/hfst-name.cc (working copy)
+@@ -96,7 +96,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "n:pt:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-pair-test.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-pair-test.cc b/trunk/tools/src/hfst-pair-test.cc
+--- a/trunk/tools/src/hfst-pair-test.cc (revision 2798)
++++ b/trunk/tools/src/hfst-pair-test.cc (working copy)
+@@ -171,7 +171,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "I:NX",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-pmatch.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-pmatch.cc b/trunk/tools/src/hfst-pmatch.cc
+--- a/trunk/tools/src/hfst-pmatch.cc (revision 2798)
++++ b/trunk/tools/src/hfst-pmatch.cc (working copy)
+@@ -180,7 +180,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT "nxlt:p",
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT "nxlt:p",
+ long_options, &option_index);
+ if (-1 == c)
+ {
+Index: tools/src/hfst-pmatch2fst.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-pmatch2fst.cc b/trunk/tools/src/hfst-pmatch2fst.cc
+--- a/trunk/tools/src/hfst-pmatch2fst.cc (revision 2798)
++++ b/trunk/tools/src/hfst-pmatch2fst.cc (working copy)
+@@ -132,7 +132,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "e:1:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-preprocess-for-optimized-lookup-format.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-preprocess-for-optimized-lookup-format.cc b/trunk/tools/src/hfst-preprocess-for-optimized-lookup-format.cc
+--- a/trunk/tools/src/hfst-preprocess-for-optimized-lookup-format.cc (revision 2798)
++++ b/trunk/tools/src/hfst-preprocess-for-optimized-lookup-format.cc (working copy)
+@@ -87,7 +87,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-project.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-project.cc b/trunk/tools/src/hfst-project.cc
+--- a/trunk/tools/src/hfst-project.cc (revision 2798)
++++ b/trunk/tools/src/hfst-project.cc (working copy)
+@@ -92,7 +92,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "p:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-prune-alphabet.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-prune-alphabet.cc b/trunk/tools/src/hfst-prune-alphabet.cc
+--- a/trunk/tools/src/hfst-prune-alphabet.cc (revision 2798)
++++ b/trunk/tools/src/hfst-prune-alphabet.cc (working copy)
+@@ -94,7 +94,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "fS",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-push-weights.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-push-weights.cc b/trunk/tools/src/hfst-push-weights.cc
+--- a/trunk/tools/src/hfst-push-weights.cc (revision 2798)
++++ b/trunk/tools/src/hfst-push-weights.cc (working copy)
+@@ -93,7 +93,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "p:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-regexp2fst.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-regexp2fst.cc b/trunk/tools/src/hfst-regexp2fst.cc
+--- a/trunk/tools/src/hfst-regexp2fst.cc (revision 2798)
++++ b/trunk/tools/src/hfst-regexp2fst.cc (working copy)
+@@ -160,7 +160,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "je:lSf:HFEx:X:"/*"123"*/,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-remove-epsilons.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-remove-epsilons.cc b/trunk/tools/src/hfst-remove-epsilons.cc
+--- a/trunk/tools/src/hfst-remove-epsilons.cc (revision 2798)
++++ b/trunk/tools/src/hfst-remove-epsilons.cc (working copy)
+@@ -86,7 +86,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-repeat.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-repeat.cc b/trunk/tools/src/hfst-repeat.cc
+--- a/trunk/tools/src/hfst-repeat.cc (revision 2798)
++++ b/trunk/tools/src/hfst-repeat.cc (working copy)
+@@ -100,7 +100,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "f:t:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-reverse.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-reverse.cc b/trunk/tools/src/hfst-reverse.cc
+--- a/trunk/tools/src/hfst-reverse.cc (revision 2798)
++++ b/trunk/tools/src/hfst-reverse.cc (working copy)
+@@ -86,7 +86,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-reweight.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-reweight.cc b/trunk/tools/src/hfst-reweight.cc
+--- a/trunk/tools/src/hfst-reweight.cc (revision 2798)
++++ b/trunk/tools/src/hfst-reweight.cc (working copy)
+@@ -159,7 +159,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "a:b:F:l:u:I:O:S:eT:A",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-shuffle.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-shuffle.cc b/trunk/tools/src/hfst-shuffle.cc
+--- a/trunk/tools/src/hfst-shuffle.cc (revision 2798)
++++ b/trunk/tools/src/hfst-shuffle.cc (working copy)
+@@ -86,7 +86,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_BINARY_SHORT,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-split.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-split.cc b/trunk/tools/src/hfst-split.cc
+--- a/trunk/tools/src/hfst-split.cc (revision 2798)
++++ b/trunk/tools/src/hfst-split.cc (working copy)
+@@ -103,7 +103,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT "i:p:e:",
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT "i:p:e:",
+ long_options, &option_index);
+ if (-1 == c)
+ {
+Index: tools/src/hfst-strings2fst.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-strings2fst.cc b/trunk/tools/src/hfst-strings2fst.cc
+--- a/trunk/tools/src/hfst-strings2fst.cc (revision 2798)
++++ b/trunk/tools/src/hfst-strings2fst.cc (working copy)
+@@ -200,7 +200,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "je:234pSm:f:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-strip-header.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-strip-header.cc b/trunk/tools/src/hfst-strip-header.cc
+--- a/trunk/tools/src/hfst-strip-header.cc (revision 2798)
++++ b/trunk/tools/src/hfst-strip-header.cc (working copy)
+@@ -63,7 +63,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-substitute.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-substitute.cc b/trunk/tools/src/hfst-substitute.cc
+--- a/trunk/tools/src/hfst-substitute.cc (revision 2798)
++++ b/trunk/tools/src/hfst-substitute.cc (working copy)
+@@ -220,7 +220,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "f:F:t:T:R9C",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-subtract.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-subtract.cc b/trunk/tools/src/hfst-subtract.cc
+--- a/trunk/tools/src/hfst-subtract.cc (revision 2798)
++++ b/trunk/tools/src/hfst-subtract.cc (working copy)
+@@ -96,7 +96,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_BINARY_SHORT "FH",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-summarize.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-summarize.cc b/trunk/tools/src/hfst-summarize.cc
+--- a/trunk/tools/src/hfst-summarize.cc (revision 2798)
++++ b/trunk/tools/src/hfst-summarize.cc (working copy)
+@@ -100,7 +100,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "S::",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-tagger/src/hfst-build-tagger.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-tagger/src/hfst-build-tagger.cc b/trunk/tools/src/hfst-tagger/src/hfst-build-tagger.cc
+--- a/trunk/tools/src/hfst-tagger/src/hfst-build-tagger.cc (revision 2798)
++++ b/trunk/tools/src/hfst-tagger/src/hfst-build-tagger.cc (working copy)
+@@ -64,7 +64,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "wDnf:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc b/trunk/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc
+--- a/trunk/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc (revision 2798)
++++ b/trunk/tools/src/hfst-tagger/src/hfst-open-input-file-for-tagger.cc (working copy)
+@@ -73,7 +73,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "wDnf:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-tagger/src/hfst-reweight-tagger.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc b/trunk/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc
+--- a/trunk/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc (revision 2798)
++++ b/trunk/tools/src/hfst-tagger/src/hfst-reweight-tagger.cc (working copy)
+@@ -81,7 +81,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "wDnf:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-tagger/src/hfst-tag.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-tagger/src/hfst-tag.cc b/trunk/tools/src/hfst-tagger/src/hfst-tag.cc
+--- a/trunk/tools/src/hfst-tagger/src/hfst-tag.cc (revision 2798)
++++ b/trunk/tools/src/hfst-tagger/src/hfst-tag.cc (working copy)
+@@ -75,7 +75,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "wDnf:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-tail.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-tail.cc b/trunk/tools/src/hfst-tail.cc
+--- a/trunk/tools/src/hfst-tail.cc (revision 2798)
++++ b/trunk/tools/src/hfst-tail.cc (working copy)
+@@ -97,7 +97,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "n:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-tokenize.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-tokenize.cc b/trunk/tools/src/hfst-tokenize.cc
+--- a/trunk/tools/src/hfst-tokenize.cc (revision 2798)
++++ b/trunk/tools/src/hfst-tokenize.cc (working copy)
+@@ -376,7 +376,7 @@
+ {0,0,0,0}
+ };
+ int option_index = 0;
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT "nawmt:zxcf",
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT "nawmt:zxcf",
+ long_options, &option_index);
+ if (-1 == c)
+ {
+Index: tools/src/hfst-traverse.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-traverse.cc b/trunk/tools/src/hfst-traverse.cc
+--- a/trunk/tools/src/hfst-traverse.cc (revision 2798)
++++ b/trunk/tools/src/hfst-traverse.cc (working copy)
+@@ -137,7 +137,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-twolc/src/commandline_src/CommandLine.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc b/trunk/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc
+--- a/trunk/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc (revision 2798)
++++ b/trunk/tools/src/hfst-twolc/src/commandline_src/CommandLine.cc (working copy)
+@@ -113,7 +113,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv,
++ int c = getopt_long(argc, argv,
+ ":hVvqsu" "i:o:" "RDi:d:f:",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-txt2fst.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-txt2fst.cc b/trunk/tools/src/hfst-txt2fst.cc
+--- a/trunk/tools/src/hfst-txt2fst.cc (revision 2798)
++++ b/trunk/tools/src/hfst-txt2fst.cc (working copy)
+@@ -118,7 +118,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT "e:nf:pC",
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/hfst-unary-tool.cc
+===================================================================
+diff --git a/trunk/tools/src/hfst-unary-tool.cc b/trunk/tools/src/hfst-unary-tool.cc
+--- a/trunk/tools/src/hfst-unary-tool.cc (revision 2798)
++++ b/trunk/tools/src/hfst-unary-tool.cc (working copy)
+@@ -82,7 +82,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT
+ HFST_GETOPT_UNARY_SHORT,
+ long_options, &option_index);
+ if (-1 == c)
+Index: tools/src/parsers/hfst-xfst.cc
+===================================================================
+diff --git a/trunk/tools/src/parsers/hfst-xfst.cc b/trunk/tools/src/parsers/hfst-xfst.cc
+--- a/trunk/tools/src/parsers/hfst-xfst.cc (revision 2798)
++++ b/trunk/tools/src/parsers/hfst-xfst.cc (working copy)
+@@ -126,7 +126,7 @@
+ };
+ int option_index = 0;
+ // add tool-specific options here
+- char c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT "f:F:e:l:p::rwk",
++ int c = getopt_long(argc, argv, HFST_GETOPT_COMMON_SHORT "f:F:e:l:p::rwk",
+ long_options, &option_index);
+ if (-1 == c)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 00479d1..7c3f311 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+hfst_03_char2int.diff
hfst_02_notimestamp.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hfst.git
More information about the debian-science-commits
mailing list