Fossil SCM
Fixed a c99ism and a missing return statement.
Commit
c01764b0d10c64480f8c3e24df329711d2f95b9d
Parent
dff26b750e4c3ce…
1 file changed
+3
-1
M
src/th.c
+3
-1
| --- src/th.c | ||
| +++ src/th.c | ||
| @@ -2894,16 +2894,17 @@ | ||
| 2894 | 2894 | pBlob = (Blob *)Th_Malloc(pMan->interp, sizeof(Blob)); |
| 2895 | 2895 | *pBlob = empty_blob; |
| 2896 | 2896 | |
| 2897 | 2897 | if( pMan->cursor >= pMan->nBuf-2 ){ |
| 2898 | 2898 | /* expand if needed */ |
| 2899 | + void * re; | |
| 2899 | 2900 | x = pMan->nBuf + 5; |
| 2900 | 2901 | if( pMan->cursor >= x ) { |
| 2901 | 2902 | assert( 0 && "This really should not happen." ); |
| 2902 | 2903 | x = pMan->cursor + 5; |
| 2903 | 2904 | } |
| 2904 | - void * re = Th_Realloc( pMan->interp, pMan->aBuf, x * sizeof(Blob*) ); | |
| 2905 | + re = Th_Realloc( pMan->interp, pMan->aBuf, x * sizeof(Blob*) ); | |
| 2905 | 2906 | if(NULL==re){ |
| 2906 | 2907 | goto error; |
| 2907 | 2908 | } |
| 2908 | 2909 | pMan->aBuf = (Blob **)re; |
| 2909 | 2910 | re = Th_Realloc( pMan->interp, pMan->aOutput, x * sizeof(Th_Vtab_OutputMethods) ); |
| @@ -2974,10 +2975,11 @@ | ||
| 2974 | 2975 | Blob * b = Th_Ob_Pop( pMan ); |
| 2975 | 2976 | if(!b) return 1; |
| 2976 | 2977 | else { |
| 2977 | 2978 | blob_reset(b); |
| 2978 | 2979 | Th_Free( pMan->interp, b ); |
| 2980 | + return 0; | |
| 2979 | 2981 | } |
| 2980 | 2982 | } |
| 2981 | 2983 | |
| 2982 | 2984 | |
| 2983 | 2985 | void Th_ob_cleanup( Th_Ob_Manager * man ){ |
| 2984 | 2986 |
| --- src/th.c | |
| +++ src/th.c | |
| @@ -2894,16 +2894,17 @@ | |
| 2894 | pBlob = (Blob *)Th_Malloc(pMan->interp, sizeof(Blob)); |
| 2895 | *pBlob = empty_blob; |
| 2896 | |
| 2897 | if( pMan->cursor >= pMan->nBuf-2 ){ |
| 2898 | /* expand if needed */ |
| 2899 | x = pMan->nBuf + 5; |
| 2900 | if( pMan->cursor >= x ) { |
| 2901 | assert( 0 && "This really should not happen." ); |
| 2902 | x = pMan->cursor + 5; |
| 2903 | } |
| 2904 | void * re = Th_Realloc( pMan->interp, pMan->aBuf, x * sizeof(Blob*) ); |
| 2905 | if(NULL==re){ |
| 2906 | goto error; |
| 2907 | } |
| 2908 | pMan->aBuf = (Blob **)re; |
| 2909 | re = Th_Realloc( pMan->interp, pMan->aOutput, x * sizeof(Th_Vtab_OutputMethods) ); |
| @@ -2974,10 +2975,11 @@ | |
| 2974 | Blob * b = Th_Ob_Pop( pMan ); |
| 2975 | if(!b) return 1; |
| 2976 | else { |
| 2977 | blob_reset(b); |
| 2978 | Th_Free( pMan->interp, b ); |
| 2979 | } |
| 2980 | } |
| 2981 | |
| 2982 | |
| 2983 | void Th_ob_cleanup( Th_Ob_Manager * man ){ |
| 2984 |
| --- src/th.c | |
| +++ src/th.c | |
| @@ -2894,16 +2894,17 @@ | |
| 2894 | pBlob = (Blob *)Th_Malloc(pMan->interp, sizeof(Blob)); |
| 2895 | *pBlob = empty_blob; |
| 2896 | |
| 2897 | if( pMan->cursor >= pMan->nBuf-2 ){ |
| 2898 | /* expand if needed */ |
| 2899 | void * re; |
| 2900 | x = pMan->nBuf + 5; |
| 2901 | if( pMan->cursor >= x ) { |
| 2902 | assert( 0 && "This really should not happen." ); |
| 2903 | x = pMan->cursor + 5; |
| 2904 | } |
| 2905 | re = Th_Realloc( pMan->interp, pMan->aBuf, x * sizeof(Blob*) ); |
| 2906 | if(NULL==re){ |
| 2907 | goto error; |
| 2908 | } |
| 2909 | pMan->aBuf = (Blob **)re; |
| 2910 | re = Th_Realloc( pMan->interp, pMan->aOutput, x * sizeof(Th_Vtab_OutputMethods) ); |
| @@ -2974,10 +2975,11 @@ | |
| 2975 | Blob * b = Th_Ob_Pop( pMan ); |
| 2976 | if(!b) return 1; |
| 2977 | else { |
| 2978 | blob_reset(b); |
| 2979 | Th_Free( pMan->interp, b ); |
| 2980 | return 0; |
| 2981 | } |
| 2982 | } |
| 2983 | |
| 2984 | |
| 2985 | void Th_ob_cleanup( Th_Ob_Manager * man ){ |
| 2986 |