moji.Squeeze() always return nil (replace the original string directly) #72

Author: azumakuniyuki

address/find.go

@@ -256,7 +256,7 @@ func Find(argv1 string) [3]string {
 		for {
 			// Remove redundant spaces from the display name when the value is not a "quoted-string"
 			if strings.HasPrefix(readbuffer[1], `"`) && strings.HasSuffix(readbuffer[1], `"`) { break }
-			readbuffer[1] = moji.Squeeze(readbuffer[1], ' ')
+			moji.Squeeze(&readbuffer[1], ' ')
 			break
 		}
 		if rfc5322.IsQuotedAddress(readbuffer[1]) == false {

fact/09-lhost-code_test.go

@@ -131,8 +131,7 @@ func EngineTest(t *testing.T, enginename string, isexpected [][]IsExpected, publ
 						// Read and decode each email file as a string
 						cx++; if emailthing.Size == 0 { t.Errorf("%s %s is empty", ee, ef); continue }
 
-						mesg = moji.ToLF(mesg)
-						fact, nyaan := Rise(mesg, emailthing.Path, ArgForRise)
+						moji.ToLF(mesg); fact, nyaan := Rise(mesg, emailthing.Path, ArgForRise)
 						cx++; if nyaan != nil { t.Logf("%s %s", ee, nyaan[0].Error()) }
 						if len(fact) != 0 { sisi = append(sisi, fact...) }
 					}

lhost/order.go

@@ -68,7 +68,7 @@ func OrderBySubject(title string) []string {
 	// The following order is decided by the first 2 words of Subject: header
 	for _, e := range []string{"[", "]", "_"} { title = strings.Replace(title, e, " ", -1) }
 
-	if strings.Contains(title, "  ") { title = moji.Squeeze(title, ' ') }
+	if strings.Contains(title, "  ") { moji.Squeeze(&title, ' ') }
 	words := strings.SplitN(strings.ToLower(title), " ", 3)
 	first := ""
 

lhost/via-exim.go

@@ -410,7 +410,7 @@ func init() {
 				} else if len(e.Diagnosis) < len(anotherone[j]) {
 					// Override the value of diagnostic code message with the value of alterrors
 					// because the latter includes the former.
-					anotherone[j] = moji.Squeeze(anotherone[j], ' ')
+					moji.Squeeze(&anotherone[j], ' ')
 					if strings.Contains(strings.ToLower(anotherone[j]), strings.ToLower(e.Diagnosis)) {
 						// anotherone[j] contains the same error message stored in e.Diagnosis
 						e.Diagnosis = anotherone[j]

moji/03-squeeze_test.go

@@ -22,7 +22,8 @@ func TestSqueeze(t *testing.T) {
 		{"", '?', ""},
 	}
 	for _, e := range ae {
-		cx++; if Squeeze(e.text, e.char) != e.expected { t.Errorf("%s(%s, %c) returns %s", fn, e.text, e.char, e.expected) }
+		cv := e.text
+		cx++; if Squeeze(&cv, e.char); cv != e.expected { t.Errorf("%s(%s, %c) returns %s", fn, e.text, e.char, e.expected) }
 	}
 	t.Logf("The number of tests = %d", cx)
 }

moji/lib.go

@@ -33,14 +33,14 @@ func Token(argv1 string, argv2 string, epoch int) string {
 
 // Squeeze remove redundant characters from the given string
 //   Arguments:
-//     - argv0 (string): String including redundant characters like "neko  chan"
-//     - argv1 (string): Characters to be squeezed, for example " "
+//     - argv0 (*string): String including redundant characters like "neko  chan"
+//     - argv1 (byte):    Characters to be squeezed, for example ' '
 //   Returns:
-//     - (string):       Squeezed string such as "neko chan"
-func Squeeze(argv0 string, argv1 byte) string {
-	if argv0 == "" { return "" }
+//     - (error):         Always nil
+func Squeeze(argv0 *string, argv1 byte) error {
+	if argv0 == nil || *argv0 == "" || strings.IndexByte(*argv0, argv1) < 0 { return nil }
 
-	bytebuffer := []byte(argv0)
+	bytebuffer := []byte(*argv0)
 	textbuffer := make([]byte, 0, len(bytebuffer))
 
 	cb := byte(0); for _, by := range bytebuffer {
@@ -49,7 +49,7 @@ func Squeeze(argv0 string, argv1 byte) string {
 		textbuffer = append(textbuffer, by)
 		cb = by
 	}
-	return string(textbuffer)
+	*argv0 = string(textbuffer); return nil
 }
 
 // Sweep clears the string out.
@@ -60,7 +60,7 @@ func Squeeze(argv0 string, argv1 byte) string {
 func Sweep(argv1 string) string {
 	if argv1 == "" { return "" }
 
-	argv1 = Squeeze(strings.TrimSpace(strings.ReplaceAll(argv1, "\t", " ")), ' ')
+	argv1 = strings.TrimSpace(strings.ReplaceAll(argv1, "\t", " ")); Squeeze(&argv1, ' ')
 	for strings.Contains(argv1, " --") {
 		// Delete all the string after a boundary string like " --neko-chan"
 		if strings.Contains(argv1, "-- ")  { break }

rfc3834/lib.go

@@ -82,8 +82,8 @@ func Inquire(bf *sis.BeforeFact) sis.RisingUnderway {
 	}
 	if recipients == 0 { return sis.RisingUnderway{} }
 
-	// Squeeze continuous "\n" in the message body
-	bf.Payload  = strings.Trim(moji.Squeeze(bf.Payload, '\n'), "\n")
+	moji.Squeeze(&bf.Payload, '\n') // Squeeze continuous "\n" in the message body
+	bf.Payload  = strings.Trim(bf.Payload, "\n")
 	bodyslices := strings.Split(bf.Payload, "\n")
 	rfc822part := ""
 

rfc5322/headers.go

@@ -39,7 +39,7 @@ func Headers(argv0 *mail.Header, argv1 bool) map[string][]string {
 				// Do not include the value of Received: header generated by qmail or qmail-clone
 				continue
 			}
-			e = moji.Squeeze(e, ' ')
+			moji.Squeeze(&e, ' ')
 			receivedby = append(receivedby, e)
 		}
 		headermaps["received"] = receivedby