striplt() is now string_trim()

[citadel.git] / citadel / server / modules / migrate / serv_migrate.c

diff --git a/citadel/server/modules/migrate/serv_migrate.c b/citadel/server/modules/migrate/serv_migrate.c
index 994d908752ed323a4b5a660669d1d59123adbf12..08568763f4c4c7a18b4693480bf35d2d1a3191f5 100644 (file)
--- a/citadel/server/modules/migrate/serv_migrate.c
+++ b/citadel/server/modules/migrate/serv_migrate.c
@@ -344,7 +344,7 @@ void migr_export_message(long msgnum) {
        }
        else {
                // Once we do the encoding we know the exact size
-               encoded_len = CtdlEncodeBase64(encoded_msg, (char *)smr.ser, smr.len, 1);
+               encoded_len = CtdlEncodeBase64(encoded_msg, (char *)smr.ser, smr.len, BASE64_YES_LINEBREAKS);
 
                // Careful now.  If the message is gargantuan, trying to write multiple gigamegs in one
                // big write operation can make our transport unhappy.  So we'll chunk it up 10 KB at a time.
@@ -935,7 +935,7 @@ int migr_restore_message_metadata(long msgnum, int refcount) {
        if (mptr != NULL) {
                char *aptr;
                safestrncpy(smi.meta_content_type, &mptr[13], sizeof smi.meta_content_type);
-               striplt(smi.meta_content_type);
+               string_trim(smi.meta_content_type);
                aptr = smi.meta_content_type;
                while (!IsEmptyStr(aptr)) {
                        if ((*aptr == ';')