Extend the enhancement to json_set() and json_replace(). Clean up cruft.

FossilOrigin-Name: 2dbb22c75e86f2e3ced38ac14b4943570d5c2f86cd5e37e875bf0c863be28836

1 files changed, 0 insertions, 82 deletions

diff --git a/src/printf.c b/src/printf.c
index a55bd2b85..87ad91f79 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -1394,34 +1394,13 @@ void sqlite3RCStrUnref(char *z){
   assert( p!=0 );
   p--;
   assert( p->nRCRef>0 );
-  assert( p->uMagic==SQLITE_RCSTR_MAGIC );
   if( p->nRCRef>=2 ){
     p->nRCRef--;
   }else{
-    if( p->xFree ) p->xFree(p->pAttach);
-#ifdef SQLITE_DEBUG
-    p->uMagic = 0;
-#endif
     sqlite3_free(p);
   }
 }
 
-#if 0
-/*
-** Return true if the reference count on the string is exactly one, meaning
-** that the string can be modified.  Return false if the reference count
-** is greater than one.
-*/
-int sqlite3RCStrIsWriteable(char *z){
-  RCStr *p = (RCStr*)z;
-  assert( p!=0 );
-  p--;
-  assert( p->nRCRef>0 );
-  assert( p->uMagic==SQLITE_RCSTR_MAGIC );
-  return p->nRCRef==1;
-}
-#endif
-
 /*
 ** Create a new string that is capable of holding N bytes of text, not counting
 ** the zero byte at the end.  The string is uninitialized.
@@ -1435,32 +1414,9 @@ char *sqlite3RCStrNew(u64 N){
   RCStr *p = sqlite3_malloc64( N + sizeof(*p) + 1 );
   if( p==0 ) return 0;
   p->nRCRef = 1;
-  p->xFree = 0;
-  p->pAttach = 0;
-#ifdef SQLITE_DEBUG
-  p->uMagic = SQLITE_RCSTR_MAGIC;
-#endif
   return (char*)&p[1];
 }
 
-#if 0
-/*
-** Return the number of bytes allocated to the string.  The value returned
-** does not include the space for the zero-terminator at the end.
-*/
-u64 sqlite3RCStrSize(char *z){
-  RCStr *p = (RCStr*)z;
-  u64 N;
-  assert( p!=0 );
-  p--;
-  assert( p->nRCRef>0 );
-  assert( p->uMagic==SQLITE_RCSTR_MAGIC );
-  N = sqlite3_msize(p);
-  N -= sizeof(p) + 1;
-  return N;
-}
-#endif
-
 /*
 ** Change the size of the string so that it is able to hold N bytes.
 ** The string might be reallocated, so return the new allocation.
@@ -1471,7 +1427,6 @@ char *sqlite3RCStrResize(char *z, u64 N){
   assert( p!=0 );
   p--;
   assert( p->nRCRef==1 );
-  assert( p->uMagic==SQLITE_RCSTR_MAGIC );
   pNew = sqlite3_realloc64(p, N+sizeof(RCStr)+1);
   if( pNew==0 ){
     sqlite3_free(p);
@@ -1480,40 +1435,3 @@ char *sqlite3RCStrResize(char *z, u64 N){
     return (char*)&pNew[1];
   }
 }
-
-#if 0
-/*
-** Add a new attachment to the string.
-**
-** A string may have no more than one attachment.  When a new attachment
-** is added, any prior attachment is destroyed.  Remove an attachment
-** by adding a zero-attachment.
-*/
-void sqlite3RCStrAttach(char *z, void *pAttach, void(*xFree)(void*)){
-  RCStr *p = (RCStr*)z;
-  assert( p!=0 );
-  p--;
-  assert( p->nRCRef>0 );
-  assert( p->uMagic==SQLITE_RCSTR_MAGIC );
-  if( p->xFree ) p->xFree(p->pAttach);
-  p->xFree = xFree;
-  p->pAttach = pAttach;
-}
-#endif
-
-#if 0
-/*
-** Return the attachment associated with a string if the attachment
-** has the destructure specified in the second argument.  If the
-** string has no attachment or if the destructor does not match,
-** then return a NULL pointr.
-*/
-void *sqlite3RCStrGetAttachment(char *z, void(*xFree)(void*)){
-  RCStr *p = (RCStr*)z;
-  assert( p!=0 );
-  p--;
-  assert( p->nRCRef>0 );
-  assert( p->uMagic==SQLITE_RCSTR_MAGIC );
-  return p->xFree==xFree ? p->pAttach : 0;
-}
-#endif