Remove SIMP_TO_TRAD_NR

diff --git a/src/SimpTradConverter.cc b/src/SimpTradConverter.cc
index 98e68f0..6d34492 100644 (file)
--- a/src/SimpTradConverter.cc
+++ b/src/SimpTradConverter.cc
@@ -38,7 +38,7 @@ SimpTradConverter::simpToTrad (const gchar *in, String &out)
         for (; i > 0; i--) {
             buf[i] = 0;
             result = (const gunichar **) bsearch (buf, simp_to_trad,
-                                            SIMP_TO_TRAD_NR, sizeof (simp_to_trad[0]),
+                                            G_N_ELEMENTS (simp_to_trad), sizeof (simp_to_trad[0]),
                                             _cmp);
             if (G_UNLIKELY (result != NULL))
                 break;

diff --git a/src/SimpTradConverterTable.h b/src/SimpTradConverterTable.h
index d5403c4..739161b 100644 (file)
--- a/src/SimpTradConverterTable.h
+++ b/src/SimpTradConverterTable.h
@@ -7561,4 +7561,3 @@ const wchar_t *simp_to_trad[][2] = {
     { L"龟", L"龜" },
 };
 #define SIMP_TO_TRAD_MAX_LEN (6)
-#define SIMP_TO_TRAD_NR (sizeof (simp_to_trad) / sizeof (simp_to_trad[0]))

diff --git a/src/update-simptrad-table.py b/src/update-simptrad-table.py
index 0c50a0f..d51c3e5 100755 (executable)
--- a/src/update-simptrad-table.py
+++ b/src/update-simptrad-table.py
@@ -49,7 +49,6 @@ def main():
         print '    { L"%s", L"%s" },' % (s.encode("utf8"), ts.encode("utf8"))
     print "};"
     print '#define SIMP_TO_TRAD_MAX_LEN (%d)' % maxlen
-    print '#define SIMP_TO_TRAD_NR (sizeof (simp_to_trad) / sizeof (simp_to_trad[0]))'
 
 if __name__ == "__main__":
     main()