Skip to content

avoid errors/warning when compiling as C++11 #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paolopas wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −20
Open

avoid errors/warning when compiling as C++11 #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions linenoise.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@

#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
#define LINENOISE_MAX_LINE 4096
static char *unsupported_term[] = {"dumb","cons25","emacs",NULL};
static const char *unsupported_term[] = {"dumb","cons25","emacs",NULL};
static linenoiseCompletionCallback *completionCallback = NULL;
static linenoiseHintsCallback *hintsCallback = NULL;
static linenoiseFreeHintsCallback *freeHintsCallback = NULL;
Expand Down Expand Up @@ -790,10 +790,10 @@ void linenoiseAddCompletion(linenoiseCompletions *lc, const char *str) {
size_t len = strlen(str);
char *copy, **cvec;

copy = malloc(len+1);
copy = (char*)malloc(len+1);
if (copy == NULL) return;
memcpy(copy,str,len+1);
cvec = realloc(lc->cvec,sizeof(char*)*(lc->len+1));
cvec = (char**)realloc(lc->cvec,sizeof(char*)*(lc->len+1));
if (cvec == NULL) {
free(copy);
return;
Expand All @@ -819,11 +819,11 @@ static void abInit(struct abuf *ab) {
}

static void abAppend(struct abuf *ab, const char *s, int len) {
char *new = realloc(ab->b,ab->len+len);
char *nw = (char*)realloc(ab->b,ab->len+len);

if (new == NULL) return;
memcpy(new+ab->len,s,len);
ab->b = new;
if (nw == NULL) return;
memcpy(nw+ab->len,s,len);
ab->b = nw;
ab->len += len;
}

Expand Down Expand Up @@ -1294,7 +1294,7 @@ int linenoiseEditStart(struct linenoiseState *l, int stdin_fd, int stdout_fd, ch
return 0;
}

char *linenoiseEditMore = "If you see this, you are misusing the API: when linenoiseEditFeed() is called, if it returns linenoiseEditMore the user is yet editing the line. See the README file for more information.";
const char *linenoiseEditMore = "If you see this, you are misusing the API: when linenoiseEditFeed() is called, if it returns linenoiseEditMore the user is yet editing the line. See the README file for more information.";

/* This function is part of the multiplexed API of linenoise, see the top
* comment on linenoiseEditStart() for more information. Call this function
Expand Down Expand Up @@ -1325,7 +1325,7 @@ char *linenoiseEditFeed(struct linenoiseState *l) {

nread = read(l->ifd,&c,1);
if (nread < 0) {
return (errno == EAGAIN || errno == EWOULDBLOCK) ? linenoiseEditMore : NULL;
return (errno == EAGAIN || errno == EWOULDBLOCK) ? (char*)linenoiseEditMore : NULL;
} else if (nread == 0) {
return NULL;
}
Expand All @@ -1336,7 +1336,7 @@ char *linenoiseEditFeed(struct linenoiseState *l) {
if ((l->in_completion || c == 9 /* TAB */) && completionCallback != NULL) {
int retval = completeLine(l,c);
/* Read next character when 0 */
if (retval == 0) return linenoiseEditMore;
if (retval == 0) return (char*)linenoiseEditMore;
c = retval;
}

Expand Down Expand Up @@ -1496,7 +1496,7 @@ char *linenoiseEditFeed(struct linenoiseState *l) {
linenoiseEditDeletePrevWord(l);
break;
}
return linenoiseEditMore;
return (char*)linenoiseEditMore;
}

/* This is part of the multiplexed linenoise API. See linenoiseEditStart()
Expand Down Expand Up @@ -1572,7 +1572,7 @@ static char *linenoiseNoTTY(void) {
if (maxlen == 0) maxlen = 16;
maxlen *= 2;
char *oldval = line;
line = realloc(line,maxlen);
line = (char*)realloc(line,maxlen);
if (line == NULL) {
if (oldval) free(oldval);
return NULL;
Expand Down Expand Up @@ -1667,7 +1667,7 @@ int linenoiseHistoryAdd(const char *line) {

/* Initialization on first call. */
if (history == NULL) {
history = malloc(sizeof(char*)*history_max_len);
history = (char**)malloc(sizeof(char*)*history_max_len);
if (history == NULL) return 0;
memset(history,0,(sizeof(char*)*history_max_len));
}
Expand All @@ -1694,14 +1694,14 @@ int linenoiseHistoryAdd(const char *line) {
* just the latest 'len' elements if the new history length value is smaller
* than the amount of items already inside the history. */
int linenoiseHistorySetMaxLen(int len) {
char **new;
char **nw;

if (len < 1) return 0;
if (history) {
int tocopy = history_len;

new = malloc(sizeof(char*)*len);
if (new == NULL) return 0;
nw = (char**)malloc(sizeof(char*)*len);
if (nw == NULL) return 0;

/* If we can't copy everything, free the elements we'll not use. */
if (len < tocopy) {
Expand All @@ -1710,10 +1710,10 @@ int linenoiseHistorySetMaxLen(int len) {
for (j = 0; j < tocopy-len; j++) free(history[j]);
tocopy = len;
}
memset(new,0,sizeof(char*)*len);
memcpy(new,history+(history_len-tocopy), sizeof(char*)*tocopy);
memset(nw,0,sizeof(char*)*len);
memcpy(nw,history+(history_len-tocopy), sizeof(char*)*tocopy);
free(history);
history = new;
history = nw;
}
history_max_len = len;
if (history_len > history_max_len)
Expand Down
2 changes: 1 addition & 1 deletion linenoise.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extern "C" {

#include <stddef.h> /* For size_t. */

extern char *linenoiseEditMore;
extern const char *linenoiseEditMore;

/* The linenoiseState structure represents the state during line editing.
* We pass this state to functions implementing specific editing
Expand Down