diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2022-10-28 04:00:00 +0200 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2022-10-29 11:57:20 +0200 |
| commit | 8df721df25864f89772c58a4486314855bf1a37e (patch) | |
| tree | 7c89253922a8f09b964876b438056e2655cc9062 /src/include | |
| parent | 467b6fb9eeb12d064c1f6fa4d7f87638e49685ca (diff) | |
| download | open-axiom-8df721df25864f89772c58a4486314855bf1a37e.tar.gz | |
Fix some compiler warnings & buffer overflows
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/edin.h | 2 | ||||
| -rw-r--r-- | src/include/open-axiom/token | 8 | ||||
| -rw-r--r-- | src/include/spadcolors.h | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/include/edin.h b/src/include/edin.h index 65f77aeb..f010aa2a 100644 --- a/src/include/edin.h +++ b/src/include/edin.h @@ -49,6 +49,8 @@ extern int convert_buffer(char * , char * , int * , int ); extern void init_buff(char * , int ); extern void forwardcopy(char * , char * , int ); extern void forwardflag_cpy(int * ,int * , int ); +extern void strmov(char *, const char*); +extern void strnmov(char *, const char*, size_t); extern void flagcpy(int * , int * ); extern void flagncpy(int * , int * , int ); extern void send_function_to_child(void); diff --git a/src/include/open-axiom/token b/src/include/open-axiom/token index a586fa6d..7f379593 100644 --- a/src/include/open-axiom/token +++ b/src/include/open-axiom/token @@ -483,13 +483,15 @@ namespace OpenAxiom { comment_token(t, TokenValue::Commentary); pos.column = frag(pos).length(); break; - case '-': - if (pos.column + 1 < frag(pos).size() - and frag(pos)[pos.column + 1] == '>') { + case '-': { + std::size_t c = pos.column + 1; + if (c < frag(pos).size() + and frag(pos)[c] == '>') { t.value = TokenValue::MapsTo; pos.column += 2; } break; + } default: break; } } diff --git a/src/include/spadcolors.h b/src/include/spadcolors.h index 63621599..a9541e73 100644 --- a/src/include/spadcolors.h +++ b/src/include/spadcolors.h @@ -50,13 +50,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define startColor 0 #define endColor (startColor+numColors) -#define colorStep ((maxColors+1)/numColors) - #define yes 1 #define no 0 #define smoothConst 50 +#ifndef saymem #define saymem(a,b,c) saymemWithLine(a,b,c,0) +#endif #define Colorcells 256 /* KF number of elements in permutation vector */ /* #define shade 5 */ #define saturation 0.8 @@ -76,6 +76,4 @@ extern Colormap colorMap; extern int num; extern int scrn; -#define maxColors DisplayCells(dsply,scrn)-1 - #endif /* OPENAXIOM_SPADCOLORS_included */ |