- Modernize code

- Unify some conversion tables.

2 files changed, 2 insertions, 11 deletions

diff --git a/vespalib/src/vespa/fastlib/text/normwordfolder.cpp b/vespalib/src/vespa/fastlib/text/normwordfolder.cpp
index f9dbf202fcb..8d3ccad9900 100644
--- a/vespalib/src/vespa/fastlib/text/normwordfolder.cpp
+++ b/vespalib/src/vespa/fastlib/text/normwordfolder.cpp
@@ -74,7 +74,6 @@ Fast_NormalizeWordFolder::Initialize()
                 _foldCase[0xda] = 'u';
                 _foldCase[0xdb] = 'u';
                 _foldCase[0xdd] = 'y';
-
                 _foldCase[0xe0] = 'a';
                 _foldCase[0xe1] = 'a';
                 _foldCase[0xe2] = 'a';
diff --git a/vespalib/src/vespa/fastlib/text/normwordfolder.h b/vespalib/src/vespa/fastlib/text/normwordfolder.h
index c596b0fd2b4..121a83e260d 100644
--- a/vespalib/src/vespa/fastlib/text/normwordfolder.h
+++ b/vespalib/src/vespa/fastlib/text/normwordfolder.h
@@ -104,20 +104,16 @@ public:
             switch(testchar) {
             case 0xc4:
             case 0xe4: // A/a with diaeresis
+            case 0xc6:
+            case 0xe6: // Letter/ligature AE/ae
                 return "ae";
 
             case 0xc5:
             case 0xe5: // A/a with ring
                 return "aa";
 
-            case 0xc6:
-            case 0xe6: // Letter/ligature AE/ae
-                return "ae";
-
             case 0xd6:
             case 0xf6: // O/o with diaeresis
-                return "oe";
-
             case 0xd8:
             case 0xf8: // O/o with stroke
                 return "oe";
@@ -133,10 +129,6 @@ public:
             case 0xde:
             case 0xfe: // norse "thorn"
                 return "th";
-
-            default:
-                return nullptr;
-
             }
 
         }