diff options
author | Thomas E. Dickey <dickey@invisible-island.net> | 2019-07-03 09:58:00 -0400 |
---|---|---|
committer | Thomas E. Dickey <dickey@invisible-island.net> | 2019-07-04 13:08:33 -0400 |
commit | 0dd86d04aa36dd592c6720c7653a0246345ddbc1 (patch) | |
tree | 74699e742889787a5c4c7d48ea9b8c6e84ee91aa | |
parent | b3ce7ce658b4336bca487aa1c9e7689622db4211 (diff) | |
download | xorg-lib-libXaw-0dd86d04aa36dd592c6720c7653a0246345ddbc1.tar.gz |
add casts to quiet gcc conversion-warnings, no object change
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
-rw-r--r-- | src/MultiSrc.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/MultiSrc.c b/src/MultiSrc.c index 15bdaf8..51973e1 100644 --- a/src/MultiSrc.c +++ b/src/MultiSrc.c @@ -298,7 +298,7 @@ XawMultiSrcInitialize(Widget request, Widget cnew, if (file != NULL) fclose(file); - src->text_src.text_format = XawFmtWide; + src->text_src.text_format = (XrmQuark)XawFmtWide; } /* @@ -325,10 +325,10 @@ ReadText(Widget w, XawTextPosition pos, XawTextBlock *text, int length) MultiPiece *piece = FindPiece(src, pos, &start); text->format = XawFmtWide; - text->firstPos = pos; + text->firstPos = (int)pos; text->ptr = (char *)(piece->text + (pos - start)); count = piece->used - (pos - start); - text->length = Max(0, (length > count) ? count : length); + text->length = (Max(0, (length > count) ? count : length)); return (pos + text->length); } @@ -420,7 +420,7 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos, end_piece->used -= endPos - end_first; if (end_piece->used != 0) memmove(end_piece->text, end_piece->text + endPos - end_first, - end_piece->used * sizeof(wchar_t)); + (size_t)end_piece->used * sizeof(wchar_t)); } else { /* We are fully in one piece */ if ((start_piece->used -= endPos - startPos) == 0) { @@ -430,7 +430,7 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos, else { memmove(start_piece->text + (startPos - start_first), start_piece->text + (endPos - start_first), - (start_piece->used - (startPos - start_first)) * + (size_t)(start_piece->used - (startPos - start_first)) * sizeof(wchar_t)); if (src->multi_src.use_string_in_place && ((src->multi_src.length - (endPos - startPos)) @@ -475,10 +475,10 @@ ReplaceText(Widget w, XawTextPosition startPos, XawTextPosition endPos, fill = Min((int)(src->multi_src.piece_size - start_piece->used), length); ptr = start_piece->text + (startPos - start_first); - memmove(ptr + fill, ptr, (start_piece->used - + memmove(ptr + fill, ptr, (size_t)(start_piece->used - (startPos - start_first)) * sizeof(wchar_t)); wptr =(wchar_t *)text.ptr; - (void)wcsncpy(ptr, wptr + firstPos, fill); + (void)wcsncpy(ptr, wptr + firstPos, (size_t)fill); startPos += fill; firstPos += fill; @@ -598,7 +598,7 @@ Scan(Widget w, register XawTextPosition position, XawTextScanType type, position += inc; if (type == XawstAlphaNumeric) { - if (!iswalnum(c)) { + if (!iswalnum((wint_t)c)) { if (non_space) break; } @@ -720,8 +720,8 @@ Search(Widget w, register XawTextPosition position, XawTextScanDirection dir, effectively factored out of the following computations */ /* STEP 3: SEARCH! */ - buf = (wchar_t *)XtMalloc(sizeof(wchar_t) * wtarget_len); - (void)wcsncpy(buf, wtarget, wtarget_len); + buf = (wchar_t *)XtMalloc((Cardinal)(sizeof(wchar_t) * (size_t)wtarget_len)); + (void)wcsncpy(buf, wtarget, (size_t)wtarget_len); piece = FindPiece(src, position, &first); ptr = (position - first) + piece->text; @@ -746,7 +746,7 @@ Search(Widget w, register XawTextPosition position, XawTextScanDirection dir, position += inc; while (ptr < piece->text) { - cnt = piece->text - ptr; + cnt = (int)(piece->text - ptr); piece = piece->prev; if (piece == NULL) { /* Begining of text */ @@ -757,7 +757,7 @@ Search(Widget w, register XawTextPosition position, XawTextScanDirection dir, } while (ptr >= piece->text + piece->used) { - cnt = ptr - (piece->text + piece->used); + cnt = (int)(ptr - (piece->text + piece->used)); piece = piece->next; if (piece == NULL) { /* End of text */ @@ -1119,16 +1119,16 @@ StorePiecesInString(MultiSrcObject src) { wchar_t *wc_string; char *mb_string; - int char_count = src->multi_src.length; + int char_count = (int)src->multi_src.length; XawTextPosition first; MultiPiece *piece; /* I believe the char_count + 1 and the NULL termination are unneeded! FS */ - wc_string = (wchar_t*)XtMalloc((char_count + 1) * sizeof(wchar_t)); + wc_string = (wchar_t*)XtMalloc((Cardinal)((size_t)(char_count + 1) * sizeof(wchar_t))); for (first = 0, piece = src->multi_src.first_piece ; piece != NULL; first += piece->used, piece = piece->next) - (void)wcsncpy(wc_string + first, piece->text, piece->used); + (void)wcsncpy(wc_string + first, piece->text, (size_t)piece->used); wc_string[char_count] = 0; @@ -1180,17 +1180,17 @@ InitStringOrFile(MultiSrcObject src, Bool newString) src->multi_src.allocated_string = True; src->multi_src.string = temp; - length = strlen((char *)src->multi_src.string); + length = (int)strlen((char *)src->multi_src.string); /* Wasteful, throwing away the WC string, but need side effect! */ (void)_XawTextMBToWC(d, (char *)src->multi_src.string, &length); src->multi_src.length = (XawTextPosition)length; } else { - src->multi_src.length = strlen((char *)src->multi_src.string); + src->multi_src.length = (XawTextPosition)strlen((char *)src->multi_src.string); /* In case the length resource is incorrectly set */ if (src->multi_src.length > src->multi_src.multi_length) - src->multi_src.multi_length = src->multi_src.length; + src->multi_src.multi_length = (int)src->multi_src.length; if (src->multi_src.multi_length == MAGIC_VALUE) src->multi_src.piece_size = src->multi_src.length; @@ -1249,7 +1249,7 @@ InitStringOrFile(MultiSrcObject src, Bool newString) } if (!src->multi_src.is_tempfile) { - if ((fd = open((char *)src->multi_src.string, open_mode, 0666)) != -1) { + if ((fd = open((char *)src->multi_src.string, (int)open_mode, 0666)) != -1) { if ((file = fdopen(fd, fdopen_mode)) != NULL) { (void)fseek(file, 0, SEEK_END); src->multi_src.length = (XawTextPosition)ftell(file); @@ -1296,7 +1296,7 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string) * in as MB length, out as WC length. We want local_length to be * WC count. */ - int local_length = src->multi_src.length; + int local_length = (int)src->multi_src.length; if (string != NULL) { /* @@ -1312,24 +1312,24 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string) * here, we are not changing the contents, just reloading, * so don't change len... */ - local_length = src->multi_src.string ? - strlen((char *)src->multi_src.string) : 0; + local_length = (int)(src->multi_src.string ? + strlen((char *)src->multi_src.string) : 0); local_str = _XawTextMBToWC(d, (char *)src->multi_src.string, &local_length); } else { if (src->multi_src.length != 0) { temp_mb_holder = - XtMalloc((src->multi_src.length + 1) * sizeof(unsigned char)); + XtMalloc(((size_t)(src->multi_src.length + 1) * sizeof(unsigned char))); fseek(file, 0, SEEK_SET); - src->multi_src.length = fread(temp_mb_holder, + src->multi_src.length = (XawTextPosition)fread(temp_mb_holder, sizeof(unsigned char), (size_t)src->multi_src.length, file); if (src->multi_src.length <= 0) XtAppErrorMsg(XtWidgetToApplicationContext ((Widget) src), "readError", "multiSource", "XawError", "fread returned error.", NULL, NULL); - local_length = src->multi_src.length; + local_length = (int)src->multi_src.length; local_str = _XawTextMBToWC(d, temp_mb_holder, &local_length); src->multi_src.length = local_length; @@ -1349,7 +1349,7 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string) "not representable in this locale.", params, &num_params); src->multi_src.length = sizeof err_text; - local_length = src->multi_src.length; + local_length = (int)src->multi_src.length; local_str = _XawTextMBToWC(d, err_text, &local_length); src->multi_src.length = local_length; } @@ -1378,7 +1378,7 @@ LoadPieces(MultiSrcObject src, FILE *file, char *string) * bytes)); piece->used = Min(left, src->multi_src.piece_size); if (piece->used != 0) - (void)wcsncpy(piece->text, ptr, piece->used); + (void)wcsncpy(piece->text, ptr, (size_t)piece->used); left -= piece->used; ptr += piece->used; @@ -1527,9 +1527,9 @@ BreakPiece(MultiSrcObject src, MultiPiece *piece) MultiPiece *cnew = AllocNewPiece(src, piece); cnew->text = (wchar_t *) - XtMalloc(src->multi_src.piece_size * sizeof(wchar_t)); + XtMalloc((Cardinal)((size_t)src->multi_src.piece_size * sizeof(wchar_t))); (void)wcsncpy(cnew->text, piece->text + HALF_PIECE, - src->multi_src.piece_size - HALF_PIECE); + (size_t)(src->multi_src.piece_size - HALF_PIECE)); piece->used = HALF_PIECE; cnew->used = src->multi_src.piece_size - HALF_PIECE; } @@ -1583,7 +1583,7 @@ CvtMultiTypeToString(Display *dpy, XrmValuePtr args, Cardinal *num_args, return (False); } - size = strlen(buffer) + 1; + size = (Cardinal)strlen(buffer) + 1; if (toVal->addr != NULL) { if (toVal->size < size) { toVal->size = size; |