Differences From:

File src/blob.c part of check-in [36b96b8616] - Rework the merge algorithm. It now only works for text files. But, it no longer gets confused by line endings (\r\n versus \n) and it reports conflicts. by drh on 2007-11-16 20:42:31. [view]

To:

File src/blob.c part of check-in [285929373757b] - Add the %w and %W formatting options for internal printf usage. Use these formatting characters to render wiki. Fix additional problems of unterminated wiki on webpage rendering by using %w. (There are probably more problems yet to be discovered and fixed.) by drh on 2007-11-22 22:55:05. Also file src/blob.c part of check-in [d0305b305a] - Merged mainline into my branch to get the newest application. by aku on 2007-12-05 08:07:46. [view]

@@ -541,29 +541,18 @@
   return i;
 }
 
 /*
-** This function implements the callback from vxprintf.
-**
-** This routine add nNewChar characters of text in zNewText to
-** the Blob structure pointed to by "arg".
-*/
-static void bout(void *arg, const char *zNewText, int nNewChar){
-  Blob *pBlob = (Blob*)arg;
-  blob_append(pBlob, zNewText, nNewChar);
-}
-
-/*
 ** Do printf-style string rendering and append the results to a blob.
 */
 void blob_appendf(Blob *pBlob, const char *zFormat, ...){
   va_list ap;
   va_start(ap, zFormat);
-  vxprintf(bout, pBlob, zFormat, ap);
+  vxprintf(pBlob, zFormat, ap);
   va_end(ap);
 }
 void blob_vappendf(Blob *pBlob, const char *zFormat, va_list ap){
-  vxprintf(bout, pBlob, zFormat, ap);
+  vxprintf(pBlob, zFormat, ap);
 }
 
 /*
 ** Initalize a blob to the data on an input channel.  Return