Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

• branch=trunk inherited from [bf1c21ba16]
• sym-trunk inherited from [bf1c21ba16]

Changes to src/checkin.c

  980    zComment = find_option("comment","m",1);                                           980    zComment = find_option("comment","m",1);
  981    forceFlag = find_option("force", "f", 0)!=0;                                       981    forceFlag = find_option("force", "f", 0)!=0;
  982    zBranch = find_option("branch","b",1);                                             982    zBranch = find_option("branch","b",1);
  983    zColor = find_option("bgcolor",0,1);                                               983    zColor = find_option("bgcolor",0,1);
  984    zBrClr = find_option("branchcolor",0,1);                                           984    zBrClr = find_option("branchcolor",0,1);
  985    while( (zTag = find_option("tag",0,1))!=0 ){                                       985    while( (zTag = find_option("tag",0,1))!=0 ){
  986      if( zTag[0]==0 ) continue;                                                       986      if( zTag[0]==0 ) continue;
  987      azTag = fossil_realloc(azTag, sizeof(char*)*(nTag+2));                       |   987      azTag = fossil_realloc((void *)azTag, sizeof(char*)*(nTag+2));
  988      azTag[nTag++] = zTag;                                                            988      azTag[nTag++] = zTag;
  989      azTag[nTag] = 0;                                                                 989      azTag[nTag] = 0;
  990    }                                                                                  990    }
  991    zComFile = find_option("message-file", "M", 1);                                    991    zComFile = find_option("message-file", "M", 1);
  992    if( find_option("private",0,0) ){                                                  992    if( find_option("private",0,0) ){
  993      g.markPrivate = 1;                                                               993      g.markPrivate = 1;
  994      if( zBranch==0 ) zBranch = "private";                                            994      if( zBranch==0 ) zBranch = "private";

Changes to src/json.c

 1663    assert( (code>=1000) && (code<=9999) );                                           1663    assert( (code>=1000) && (code<=9999) );
 1664    free(g.zErrMsg);                                                                  1664    free(g.zErrMsg);
 1665    g.json.resultCode = code;                                                         1665    g.json.resultCode = code;
 1666    if(!fmt || !*fmt){                                                                1666    if(!fmt || !*fmt){
 1667      g.zErrMsg = mprintf("%s", json_err_cstr(code));                                 1667      g.zErrMsg = mprintf("%s", json_err_cstr(code));
 1668    }else{                                                                            1668    }else{
 1669      va_list vargs;                                                                  1669      va_list vargs;
                                                                                        >  1670      char * msg;
 1670      va_start(vargs,fmt);                                                            1671      va_start(vargs,fmt);
 1671      char * msg = vmprintf(fmt, vargs);                                           |  1672      msg = vmprintf(fmt, vargs);
 1672      va_end(vargs);                                                                  1673      va_end(vargs);
 1673      g.zErrMsg = msg;                                                                1674      g.zErrMsg = msg;
 1674    }                                                                                 1675    }
 1675    return code;                                                                      1676    return code;
 1676  }                                                                                   1677  }
 1677                                                                                      1678  
 1678  /*                                                                                  1679  /*

Changes to src/json_tag.c

  111    cson_object_set(pay, "value", (zValue&&*zValue)                                    111    cson_object_set(pay, "value", (zValue&&*zValue)
  112                    ? json_new_string(zValue)                                          112                    ? json_new_string(zValue)
  113                    : cson_value_null());                                              113                    : cson_value_null());
  114    cson_object_set(pay, "propagate", cson_value_new_bool(fPropagate));                114    cson_object_set(pay, "propagate", cson_value_new_bool(fPropagate));
  115    cson_object_set(pay, "raw", cson_value_new_bool(fRaw));                            115    cson_object_set(pay, "raw", cson_value_new_bool(fRaw));
  116    {                                                                                  116    {
  117      Blob uu = empty_blob;                                                            117      Blob uu = empty_blob;
                                                                                        >   118      int rc;
  118      blob_append(&uu, zName, -1);                                                     119      blob_append(&uu, zName, -1);
  119      int const rc = name_to_uuid(&uu, 9, "*");                                    |   120      rc = name_to_uuid(&uu, 9, "*");
  120      if(0!=rc){                                                                       121      if(0!=rc){
  121        json_set_err(FSL_JSON_E_UNKNOWN,"Could not convert name back to UUID!");       122        json_set_err(FSL_JSON_E_UNKNOWN,"Could not convert name back to UUID!");
  122        blob_reset(&uu);                                                               123        blob_reset(&uu);
  123        goto error;                                                                    124        goto error;
  124      }                                                                                125      }
  125      cson_object_set(pay, "appliedTo", json_new_string(blob_buffer(&uu)));            126      cson_object_set(pay, "appliedTo", json_new_string(blob_buffer(&uu)));
  126      blob_reset(&uu);                                                                 127      blob_reset(&uu);

Changes to src/json_wiki.c

  105      cson_object_set(pay,FossilJsonKeys.timestamp,                                    105      cson_object_set(pay,FossilJsonKeys.timestamp,
  106                      json_julian_to_timestamp(pWiki->rDate));                         106                      json_julian_to_timestamp(pWiki->rDate));
  107      if(0 == contentFormat){                                                          107      if(0 == contentFormat){
  108        cson_object_set(pay,"size",                                                    108        cson_object_set(pay,"size",
  109                        json_new_int((cson_int_t)(zBody?strlen(zBody):0)));            109                        json_new_int((cson_int_t)(zBody?strlen(zBody):0)));
  110      }else{                                                                           110      }else{
  111        if( contentFormat>0 ){/*HTML-ize it*/                                          111        if( contentFormat>0 ){/*HTML-ize it*/
  112          zFormat = "html";                                                        <
  113          Blob content = empty_blob;                                                   112          Blob content = empty_blob;
  114          Blob raw = empty_blob;                                                       113          Blob raw = empty_blob;
                                                                                        >   114          zFormat = "html";
  115          if(zBody && *zBody){                                                         115          if(zBody && *zBody){
  116            blob_append(&raw,zBody,-1);                                                116            blob_append(&raw,zBody,-1);
  117            wiki_convert(&raw,&content,0);                                             117            wiki_convert(&raw,&content,0);
  118            len = (unsigned int)blob_size(&content);                                   118            len = (unsigned int)blob_size(&content);
  119          }                                                                            119          }
  120          cson_object_set(pay,"size",json_new_int((cson_int_t)len));                   120          cson_object_set(pay,"size",json_new_int((cson_int_t)len));
  121          cson_object_set(pay,"content",                                               121          cson_object_set(pay,"content",