Fossil SCM
Improve error message consistency.
Commit
97ea05f8dc082d0103da2d9ab4a0ce91e3c2b3dc
Parent
46d74582d2223c9…
1 file changed
+2
-2
+2
-2
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -954,11 +954,11 @@ | ||
| 954 | 954 | blob_reset(&bUuid); |
| 955 | 955 | return p; |
| 956 | 956 | |
| 957 | 957 | manifest_syntax_error: |
| 958 | 958 | if(bUuid.nUsed){ |
| 959 | - blob_appendf(pErr, "manifest UUID %.40s ", blob_str(&bUuid)); | |
| 959 | + blob_appendf(pErr, "manifest [%.40s] ", blob_str(&bUuid)); | |
| 960 | 960 | blob_reset(&bUuid); |
| 961 | 961 | } |
| 962 | 962 | if( zErr ){ |
| 963 | 963 | blob_appendf(pErr, "line %d: %s", lineNo, zErr); |
| 964 | 964 | }else{ |
| @@ -1744,11 +1744,11 @@ | ||
| 1744 | 1744 | if( (p = manifest_cache_find(rid))!=0 ){ |
| 1745 | 1745 | blob_reset(pContent); |
| 1746 | 1746 | }else if( (p = manifest_parse(pContent, rid, 0))==0 ){ |
| 1747 | 1747 | assert( blob_is_reset(pContent) || pContent==0 ); |
| 1748 | 1748 | fossil_error(1, "syntax error in manifest [%s]", |
| 1749 | - db_text(0,"SELECT uuid FROM blob WHERE rid=%d",rid)); | |
| 1749 | + db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid)); | |
| 1750 | 1750 | return 0; |
| 1751 | 1751 | } |
| 1752 | 1752 | if( g.xlinkClusterOnly && p->type!=CFTYPE_CLUSTER ){ |
| 1753 | 1753 | manifest_destroy(p); |
| 1754 | 1754 | assert( blob_is_reset(pContent) ); |
| 1755 | 1755 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -954,11 +954,11 @@ | |
| 954 | blob_reset(&bUuid); |
| 955 | return p; |
| 956 | |
| 957 | manifest_syntax_error: |
| 958 | if(bUuid.nUsed){ |
| 959 | blob_appendf(pErr, "manifest UUID %.40s ", blob_str(&bUuid)); |
| 960 | blob_reset(&bUuid); |
| 961 | } |
| 962 | if( zErr ){ |
| 963 | blob_appendf(pErr, "line %d: %s", lineNo, zErr); |
| 964 | }else{ |
| @@ -1744,11 +1744,11 @@ | |
| 1744 | if( (p = manifest_cache_find(rid))!=0 ){ |
| 1745 | blob_reset(pContent); |
| 1746 | }else if( (p = manifest_parse(pContent, rid, 0))==0 ){ |
| 1747 | assert( blob_is_reset(pContent) || pContent==0 ); |
| 1748 | fossil_error(1, "syntax error in manifest [%s]", |
| 1749 | db_text(0,"SELECT uuid FROM blob WHERE rid=%d",rid)); |
| 1750 | return 0; |
| 1751 | } |
| 1752 | if( g.xlinkClusterOnly && p->type!=CFTYPE_CLUSTER ){ |
| 1753 | manifest_destroy(p); |
| 1754 | assert( blob_is_reset(pContent) ); |
| 1755 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -954,11 +954,11 @@ | |
| 954 | blob_reset(&bUuid); |
| 955 | return p; |
| 956 | |
| 957 | manifest_syntax_error: |
| 958 | if(bUuid.nUsed){ |
| 959 | blob_appendf(pErr, "manifest [%.40s] ", blob_str(&bUuid)); |
| 960 | blob_reset(&bUuid); |
| 961 | } |
| 962 | if( zErr ){ |
| 963 | blob_appendf(pErr, "line %d: %s", lineNo, zErr); |
| 964 | }else{ |
| @@ -1744,11 +1744,11 @@ | |
| 1744 | if( (p = manifest_cache_find(rid))!=0 ){ |
| 1745 | blob_reset(pContent); |
| 1746 | }else if( (p = manifest_parse(pContent, rid, 0))==0 ){ |
| 1747 | assert( blob_is_reset(pContent) || pContent==0 ); |
| 1748 | fossil_error(1, "syntax error in manifest [%s]", |
| 1749 | db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid)); |
| 1750 | return 0; |
| 1751 | } |
| 1752 | if( g.xlinkClusterOnly && p->type!=CFTYPE_CLUSTER ){ |
| 1753 | manifest_destroy(p); |
| 1754 | assert( blob_is_reset(pContent) ); |
| 1755 |