3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

semver: warnings cleanup

Browse Source
This commit is contained in:
Vojtech Kral 2019-06-25 16:54:11 +02:00
parent 84027a3d3b
commit f7d4a35c3d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/semver/semver.c
View File

@ -22,6 +22,10 @@
static const size_t MAX_SIZE = sizeof(char) * 255; static const size_t MAX_SIZE = sizeof(char) * 255;
static const int MAX_SAFE_INT = (unsigned int) -1 >> 1; static const int MAX_SAFE_INT = (unsigned int) -1 >> 1;
#ifdef _WIN32
#define strdup _strdup
#endif
/** /**
* Define comparison operators, storing the * Define comparison operators, storing the
* ASCII code per each symbol in hexadecimal notation. * ASCII code per each symbol in hexadecimal notation.
@ -50,8 +54,8 @@ strcut (char *str, int begin, int len) {
if((int)l < 0 || (int)l > MAX_SAFE_INT) return -1; if((int)l < 0 || (int)l > MAX_SAFE_INT) return -1;
if (len < 0) len = l - begin + 1; if (len < 0) len = (int)l - begin + 1;
if (begin + len > (int)l) len = l - begin; if (begin + len > (int)l) len = (int)l - begin;
memmove(str + begin, str + begin + len, l - len + 1 - begin); memmove(str + begin, str + begin + len, l - len + 1 - begin);
return len; return len;
@ -104,7 +108,7 @@ parse_int (const char *s) {
static char * static char *
parse_slice (char *buf, char sep) { parse_slice (char *buf, char sep) {
char *pr, *part; char *pr, *part;
int plen; size_t plen;
/* Find separator in buf */ /* Find separator in buf */
pr = strchr(buf, sep); pr = strchr(buf, sep);
@ -210,8 +214,9 @@ semver_parse_version (const char *str, semver_t *ver) {
static int static int
compare_prerelease (char *x, char *y) { compare_prerelease (char *x, char *y) {
char *lastx, *lasty, *xptr, *yptr, *endptr; char *lastx, *lasty, *xptr, *yptr, *endptr;
int xlen, ylen, xisnum, yisnum, xnum, ynum; size_t xlen, ylen, xn, yn, min;
int xn, yn, min, res; int xisnum, yisnum, xnum, ynum;
int res;
if (x == NULL && y == NULL) return 0; if (x == NULL && y == NULL) return 0;
if (y == NULL && x) return -1; if (y == NULL && x) return -1;
if (x == NULL && y) return 1; if (x == NULL && y) return 1;
@ -572,7 +577,7 @@ semver_clean (char *s) {
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (contains(s[i], VALID_CHARS, mlen) == 0) { if (contains(s[i], VALID_CHARS, mlen) == 0) {
res = strcut(s, i, 1); res = strcut(s, (int)i, 1);
if(res == -1) return -1; if(res == -1) return -1;
--len; --i; --len; --i;
} }