X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=qstring.c;h=4e2ba083b71269e53c9e805718817a57031b2598;hb=0fe28e0d9f549fab79793d3fa2f139e643d3f134;hp=ad1776949d4ca2beed84fdcb1d9e6a05b61ecb8d;hpb=764c1caeb32bae139ce3984cba987e328a66e2ab;p=qemu.git diff --git a/qstring.c b/qstring.c index ad1776949..4e2ba083b 100644 --- a/qstring.c +++ b/qstring.c @@ -1,14 +1,15 @@ /* - * QString data type. + * QString Module * * Copyright (C) 2009 Red Hat Inc. * * Authors: * Luiz Capitulino * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. */ + #include "qobject.h" #include "qstring.h" #include "qemu-common.h" @@ -31,21 +32,21 @@ QString *qstring_new(void) } /** - * qstring_from_str(): Create a new QString from a regular C string + * qstring_from_substr(): Create a new QString from a C string substring * - * Return strong reference. + * Return string reference */ -QString *qstring_from_str(const char *str) +QString *qstring_from_substr(const char *str, int start, int end) { QString *qstring; qstring = qemu_malloc(sizeof(*qstring)); - qstring->length = strlen(str); + qstring->length = end - start + 1; qstring->capacity = qstring->length; qstring->string = qemu_malloc(qstring->capacity + 1); - memcpy(qstring->string, str, qstring->length); + memcpy(qstring->string, str + start, qstring->length); qstring->string[qstring->length] = 0; QOBJECT_INIT(qstring, &qstring_type); @@ -53,6 +54,16 @@ QString *qstring_from_str(const char *str) return qstring; } +/** + * qstring_from_str(): Create a new QString from a regular C string + * + * Return strong reference. + */ +QString *qstring_from_str(const char *str) +{ + return qstring_from_substr(str, 0, strlen(str) - 1); +} + static void capacity_increase(QString *qstring, size_t len) { if (qstring->capacity < (qstring->length + len)) {