Changeset 989:1b3cc75a9bab for charset.c

Timestamp:

1999-03-30 22:34:01 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Another small charset optimization.

Files:

• charset.c (modified) (6 diffs)

charset.c

@@ -877 +877 @@
   d->out.size = DECODER_BUFFSIZE;
 
+  d->_in = &d->out;
+  
   if (!src || !dest || mutt_is_utf8 (dest))
   {
     d->just_take_id = 1;
+    d->_in = &d->in;
     return d;
   }
@@ -888 +891 @@
     {
       d->just_take_id = 1;
+      d->_in = &d->in;
       return d;
     }
@@ -896 +900 @@
   
   if (!(d->chm = mutt_get_translation (src, dest)))
+  {
     d->just_take_id = 1;
-  
+    d->_in = &d->in;
+  }
+
   return d;
 }
@@ -910 +917 @@
 void mutt_decoder_push (DECODER *d, void *_buff, size_t blen, size_t *taken)
 {
-  struct decoder_buff *b;
-  
   if (!_buff || !blen)
   {
@@ -917 +922 @@
     return;
   }
-  
-  /* shortcut the identity mapping and save one copying pass */
-  
-  if (d->just_take_id)
-    b = &d->out;
-  else
-    b = &d->in;
-    
-  if ((*taken = MIN(blen, b->size - b->used)))
-  {
-    memcpy (b->buff + b->used, _buff, *taken);
-    b->used += *taken;
+
+  if ((*taken = MIN(blen, d->_in->size - d->_in->used)))
+  {
+    memcpy (d->_in->buff + d->_in->used, _buff, *taken);
+    d->_in->used += *taken;
   }
 }
@@ -934 +932 @@
 int mutt_decoder_push_one (DECODER *d, char c)
 {
-  struct decoder_buff *b;
-
-  if (d->just_take_id)
-    b = &d->out;
-  else
-    b = &d->in;
-
-  if (b->used == b->size)
+  if (d->_in->used == d->_in->size)
     return -1;
-  
-  b->buff[b->used++] = c;
+
+  d->_in->buff[d->_in->used++] = c;
   return 0;
 }