SERVER-4312 Simplify previous "kill buffer" fix

Just skip the join code when no previous kill buffer exists,
simpler code with less duplication.

1 files changed, 5 insertions, 12 deletions

diff --git a/src/third_party/linenoise/linenoise.cpp b/src/third_party/linenoise/linenoise.cpp
index 11c230a8b51..dd4d7dbbd39 100644
--- a/src/third_party/linenoise/linenoise.cpp
+++ b/src/third_party/linenoise/linenoise.cpp
@@ -296,18 +296,11 @@ public:
         memcpy( textCopy, text, textLen );
         textCopy[ textLen ] = 0;
         string textCopyString( textCopy );
-        if ( lastAction == actionKill ) {
-            if ( size == 0 ) {
-                indexToSlot[0] = 0;
-                size++;
-                theRing.push_back( textCopyString );
-            }
-            else {
-                int slot = indexToSlot[0];
-                theRing[slot] = forward ?
-                    theRing[slot] + textCopyString :
-                    textCopyString + theRing[slot];
-            }
+        if ( lastAction == actionKill && size > 0 ) {
+            int slot = indexToSlot[0];
+            theRing[slot] = forward ?
+                theRing[slot] + textCopyString :
+                textCopyString + theRing[slot];
         }
         else {
             if ( size < capacity ) {