Changeset 987:8515cd4f20f7 for charset.c

Timestamp:

1999-03-30 16:11:03 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

A couple of optimizations, most notably for the special case of a
non-prefix state.

Files:

• charset.c (modified) (4 diffs)

charset.c

@@ -910 +910 @@
 void mutt_decoder_push (DECODER *d, void *_buff, size_t blen, size_t *taken)
 {
+  struct decoder_buff *b;
+  
   if (!_buff || !blen)
   {
@@ -915 +917 @@
     return;
   }
-
-  if ((*taken = MIN(blen, d->in.size - d->in.used)))
-  {
-    memcpy (d->in.buff + d->in.used, _buff, *taken);
-    d->in.used += *taken;
-  }
-}
-
+  
+  /* 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;
+  }
+}
+
+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)
+    return -1;
+  
+  b->buff[b->used++] = c;
+  return 0;
+}
 
 void mutt_decoder_pop (DECODER *d, void *_buff, size_t blen, size_t *popped)
@@ -942 +966 @@
   char tmp[DECODER_BUFFSIZE];
   size_t i, l;
-  
-  do 
-  {
-    mutt_decoder_pop (d, tmp, sizeof (tmp), &l);
-    for (i = 0; i < l; i++)
-      state_prefix_putc (tmp[i], s);
-  }
-  while (l > 0);
+
+  if (s->prefix)
+  {
+    do 
+    {
+      mutt_decoder_pop (d, tmp, sizeof (tmp), &l);
+      for (i = 0; i < l; i++)
+        state_prefix_putc (tmp[i], s);
+    }
+    while (l > 0);
+  }
+  else
+  {
+    do 
+    {
+      mutt_decoder_pop (d, tmp, sizeof (tmp), &l);
+      fwrite (tmp, l, 1, s->fpout);
+    }
+    while (l > 0);
+  }
 }
 
@@ -1011 +1047 @@
   if (force) d->forced = 1;
   
-  if (d->just_take_id)
-  {
-    size_t l = MIN (d->out.size - d->out.used, d->in.used);
-    memmove (d->out.buff + d->out.used, d->in.buff, l);
-    memmove (d->in.buff, d->in.buff + l, d->in.used - l);
-    d->in.used -= l;
-    d->out.used += l;
-  }
-  else if (d->src_is_utf8)
-    _process_data_utf8 (d);
-  else
-    _process_data_8bit (d);
+  if (!d->just_take_id)
+  {
+    if (d->src_is_utf8)
+      _process_data_utf8 (d);
+    else
+      _process_data_8bit (d);
+  }
 }