[patch] Patch to remove string-formatting code, to enable builds on IRIX

sqlite-3.6-irix.patch (text/plain), 8.05 KB, created by Stuart Shelton on 2009-07-01 15:46:15 UTC

--- tool/mksqlite3c.tcl.dist	2009-01-29 12:35:36.290616080 +0000
+++ tool/mksqlite3c.tcl	2009-01-29 12:36:48.669221360 +0000
@@ -116,18 +116,11 @@
 }
 set available_hdr(sqliteInt.h) 0
 
-# 78 stars used for comment formatting.
-set s78 \
-{*****************************************************************************}
-
 # Insert a comment into the code
 #
 proc section_comment {text} {
-  global out s78
-  set n [string length $text]
-  set nstar [expr {60 - $n}]
-  set stars [string range $s78 0 $nstar]
-  puts $out "/************** $text $stars/"
+  global out
+  puts $out "/* $text */"
 }
 
 # Read the source file named $filename and write it into the
--- tool/mksqlite3internalh.tcl.dist	2009-01-29 12:35:49.680847840 +0000
+++ tool/mksqlite3internalh.tcl	2009-01-29 12:37:08.979690320 +0000
@@ -74,18 +74,11 @@
   set available_hdr($hdr) 1
 }
 
-# 78 stars used for comment formatting.
-set s78 \
-{*****************************************************************************}
-
 # Insert a comment into the code
 #
 proc section_comment {text} {
-  global out s78
-  set n [string length $text]
-  set nstar [expr {60 - $n}]
-  set stars [string range $s78 0 $nstar]
-  puts $out "/************** $text $stars/"
+  global out
+  puts $out "/* $text */"
 }
 
 # Read the source file named $filename and write it into the
--- tool/spaceanal.tcl.dist	2009-01-29 12:36:02.450720560 +0000
+++ tool/spaceanal.tcl	2009-01-29 12:37:35.200719040 +0000
@@ -464,9 +464,7 @@
   # Output the sub-report title, nicely decorated with * characters.
   #
   puts ""
-  set len [string length $title]
-  set stars [string repeat * [expr 65-$len]]
-  puts "*** $title $stars"
+  puts "*** $title ***"
   puts ""
 
   # Calculate statistics and store the results in TCL variables, as follows:
--- ./src/select.c.dist	2009-03-09 13:58:51.878365360 +0000
+++ ./src/select.c	2009-03-09 14:01:30.253993920 +0000
@@ -4128,7 +4128,7 @@ void sqlite3PrintExprList(ExprList *pLis
   }
 }
 void sqlite3PrintSelect(Select *p, int indent){
-  sqlite3DebugPrintf("%*sSELECT(%p) ", indent, "", p);
+  sqlite3DebugPrintf("SELECT(%p) ", p);
   sqlite3PrintExprList(p->pEList);
   sqlite3DebugPrintf("\n");
   if( p->pSrc ){
@@ -4137,12 +4137,12 @@ void sqlite3PrintSelect(Select *p, int i
     zPrefix = "FROM";
     for(i=0; i<p->pSrc->nSrc; i++){
       struct SrcList_item *pItem = &p->pSrc->a[i];
-      sqlite3DebugPrintf("%*s ", indent+6, zPrefix);
+      sqlite3DebugPrintf("%s ", zPrefix);
       zPrefix = "";
       if( pItem->pSelect ){
         sqlite3DebugPrintf("(\n");
         sqlite3PrintSelect(pItem->pSelect, indent+10);
-        sqlite3DebugPrintf("%*s)", indent+8, "");
+        sqlite3DebugPrintf(")");
       }else if( pItem->zName ){
         sqlite3DebugPrintf("%s", pItem->zName);
       }
@@ -4159,22 +4159,22 @@ void sqlite3PrintSelect(Select *p, int i
     }
   }
   if( p->pWhere ){
-    sqlite3DebugPrintf("%*s WHERE ", indent, "");
+    sqlite3DebugPrintf(" WHERE ");
     sqlite3PrintExpr(p->pWhere);
     sqlite3DebugPrintf("\n");
   }
   if( p->pGroupBy ){
-    sqlite3DebugPrintf("%*s GROUP BY ", indent, "");
+    sqlite3DebugPrintf(" GROUP BY ");
     sqlite3PrintExprList(p->pGroupBy);
     sqlite3DebugPrintf("\n");
   }
   if( p->pHaving ){
-    sqlite3DebugPrintf("%*s HAVING ", indent, "");
+    sqlite3DebugPrintf(" HAVING ");
     sqlite3PrintExpr(p->pHaving);
     sqlite3DebugPrintf("\n");
   }
   if( p->pOrderBy ){
-    sqlite3DebugPrintf("%*s ORDER BY ", indent, "");
+    sqlite3DebugPrintf(" ORDER BY ");
     sqlite3PrintExprList(p->pOrderBy);
     sqlite3DebugPrintf("\n");
   }
--- ./src/shell.c.dist	2009-03-09 13:58:51.887430640 +0000
+++ ./src/shell.c	2009-03-09 14:02:10.130845600 +0000
@@ -548,7 +548,7 @@ static int callback(void *pArg, int nArg
       }
       if( p->cnt++>0 ) fprintf(p->out,"\n");
       for(i=0; i<nArg; i++){
-        fprintf(p->out,"%*s = %s\n", w, azCol[i],
+        fprintf(p->out,"%s = %s\n", azCol[i],
                 azArg[i] ? azArg[i] : p->nullvalue);
       }
       break;
--- ./tool/lemon.c.dist	2009-03-09 13:58:51.897123840 +0000
+++ ./tool/lemon.c	2009-03-09 14:08:49.731409520 +0000
@@ -1667,11 +1667,6 @@ FILE *err;
   }
   spcnt += k;
   for(; argv[i]; i++) fprintf(err," %s",argv[i]);
-  if( spcnt<20 ){
-    fprintf(err,"\n%*s^-- here\n",spcnt,"");
-  }else{
-    fprintf(err,"\n%*shere --^\n",spcnt-7,"");
-  }
 }
 
 /*
@@ -1913,18 +1908,15 @@ void OptPrint(){
         break;
       case OPT_INT:
       case OPT_FINT:
-        fprintf(errstream,"  %s=<integer>%*s  %s\n",op[i].label,
-          (int)(max-lemonStrlen(op[i].label)-9),"",op[i].message);
+        fprintf(errstream,"  %s=<integer> %s\n",op[i].label,op[i].message);
         break;
       case OPT_DBL:
       case OPT_FDBL:
-        fprintf(errstream,"  %s=<real>%*s  %s\n",op[i].label,
-          (int)(max-lemonStrlen(op[i].label)-6),"",op[i].message);
+        fprintf(errstream,"  %s=<real> %s\n",op[i].label,op[i].message);
         break;
       case OPT_STR:
       case OPT_FSTR:
-        fprintf(errstream,"  %s=<string>%*s  %s\n",op[i].label,
-          (int)(max-lemonStrlen(op[i].label)-8),"",op[i].message);
+        fprintf(errstream,"  %s=<string> %s\n",op[i].label,op[i].message);
         break;
     }
   }
@@ -2866,25 +2858,25 @@ int PrintAction(struct action *ap, FILE 
   int result = 1;
   switch( ap->type ){
     case SHIFT:
-      fprintf(fp,"%*s shift  %d",indent,ap->sp->name,ap->x.stp->statenum);
+      fprintf(fp,"%s shift  %d",ap->sp->name,ap->x.stp->statenum);
       break;
     case REDUCE:
-      fprintf(fp,"%*s reduce %d",indent,ap->sp->name,ap->x.rp->index);
+      fprintf(fp,"%s reduce %d",ap->sp->name,ap->x.rp->index);
       break;
     case ACCEPT:
-      fprintf(fp,"%*s accept",indent,ap->sp->name);
+      fprintf(fp,"%s accept",ap->sp->name);
       break;
     case ERROR:
-      fprintf(fp,"%*s error",indent,ap->sp->name);
+      fprintf(fp,"%s error",ap->sp->name);
       break;
     case SRCONFLICT:
     case RRCONFLICT:
-      fprintf(fp,"%*s reduce %-3d ** Parsing conflict **",
-        indent,ap->sp->name,ap->x.rp->index);
+      fprintf(fp,"%s reduce %-3d ** Parsing conflict **",
+        ap->sp->name,ap->x.rp->index);
       break;
     case SSCONFLICT:
-      fprintf(fp,"%*s shift  %d ** Parsing conflict **", 
-        indent,ap->sp->name,ap->x.stp->statenum);
+      fprintf(fp,"%s shift  %d ** Parsing conflict **", 
+        ap->sp->name,ap->x.stp->statenum);
       break;
     case SH_RESOLVED:
     case RD_RESOLVED:
@@ -2916,7 +2908,7 @@ struct lemon *lemp;
       char buf[20];
       if( cfp->dot==cfp->rp->nrhs ){
         sprintf(buf,"(%d)",cfp->rp->index);
-        fprintf(fp,"    %5s ",buf);
+        fprintf(fp,"    %s ",buf);
       }else{
         fprintf(fp,"          ");
       }
@@ -3817,9 +3809,9 @@ int mhflag;     /* Output in makeheaders
     for(i=0; i<lemp->nterminal; i++){
       struct symbol *p = lemp->symbols[i];
       if( p->fallback==0 ){
-        fprintf(out, "    0,  /* %10s => nothing */\n", p->name);
+        fprintf(out, "    0,  /* %s => nothing */\n", p->name);
       }else{
-        fprintf(out, "  %3d,  /* %10s => %s */\n", p->fallback->index,
+        fprintf(out, "  %3d,  /* %s => %s */\n", p->fallback->index,
           p->name, p->fallback->name);
       }
       lineno++;
--- ./tool/mkkeywordhash.c.dist	2009-03-09 13:58:51.906732880 +0000
+++ ./tool/mkkeywordhash.c	2009-03-09 14:06:25.231618240 +0000
@@ -472,7 +472,7 @@ int main(int argc, char **argv){
     memcpy(&zText[k], p->zName, p->len);
     k += p->len;
     if( j+p->len>70 ){
-      printf("%*s */\n", 74-j, "");
+      printf(" */\n");
       j = 0;
     }
     if( j==0 ){
@@ -483,7 +483,7 @@ int main(int argc, char **argv){
     j += p->len;
   }
   if( j>0 ){
-    printf("%*s */\n", 74-j, "");
+    printf(" */\n");
   }
   printf("  static const char zText[%d] = {\n", nChar);
   zText[nChar] = 0;
@@ -557,7 +557,7 @@ int main(int argc, char **argv){
   for(i=j=0; i<nKeyword; i++){
     char *zToken = aKeywordTable[i].zTokenType;
     if( j==0 ) printf("    ");
-    printf("%s,%*s", zToken, (int)(14-strlen(zToken)), "");
+    printf("%s, ", zToken);
     j++;
     if( j>=5 ){
       printf("\n");