Commit a38ed811 authored by Kevin Wolf's avatar Kevin Wolf Committed by Stefan Hajnoczi
Browse files

qemu-io: Move qemu_strsep() to cutils.c 



Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent e681be7e

cmd.c

+0 −21
Original line number Diff line number Diff line
@@ -255,27 +255,6 @@ fetchline(void) 
}

#endif



static char *qemu_strsep(char **input, const char *delim)

{

    char *result = *input;

    if (result != NULL) {

        char *p;



        for (p = result; *p != '\0'; p++) {

            if (strchr(delim, *p)) {

                break;

            }

        }

        if (*p == '\0') {

            *input = NULL;

        } else {

            *p = '\0';

            *input = p + 1;

        }

    }

    return result;

}



char **breakline(char *input, int *count)

{

    int c = 0;

include/qemu-common.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ char *pstrcat(char *buf, int buf_size, const char *s); 
int strstart(const char *str, const char *val, const char **ptr);

int stristart(const char *str, const char *val, const char **ptr);

int qemu_strnlen(const char *s, int max_len);

char *qemu_strsep(char **input, const char *delim);

time_t mktimegm(struct tm *tm);

int qemu_fls(int i);

int qemu_fdatasync(int fd);

util/cutils.c

+21 −0
Original line number Diff line number Diff line
@@ -107,6 +107,27 @@ int qemu_strnlen(const char *s, int max_len) 
    return i;

}



char *qemu_strsep(char **input, const char *delim)

{

    char *result = *input;

    if (result != NULL) {

        char *p;



        for (p = result; *p != '\0'; p++) {

            if (strchr(delim, *p)) {

                break;

            }

        }

        if (*p == '\0') {

            *input = NULL;

        } else {

            *p = '\0';

            *input = p + 1;

        }

    }

    return result;

}



time_t mktimegm(struct tm *tm)

{

    time_t t;