libvirt/src/util/viruri.h

/*
 * viruri.h: internal definitions used for URI parsing.
 *
 * Copyright (C) 2012 Red Hat, Inc.
 *
 * See COPYING.LIB for the License of this software
 */

#ifndef __VIR_URI_H__
# define __VIR_URI_H__

# include <libxml/uri.h>

# include "internal.h"

typedef xmlURI    virURI;
typedef xmlURIPtr virURIPtr;

virURIPtr virURIParse(const char *uri);
char *virURIFormat(virURIPtr uri);

void virURIFree(virURIPtr uri);

#endif /* __VIR_URI_H__ */
Fixed URI parsing Function xmlParseURI does not remove square brackets around IPv6 address when parsing. One of the solutions is making wrappers around functions working with xmlURI*. This assures that uri->server will be always properly assigned and it doesn't have to be changed when used on some new place in the code. For this purpose, functions virParseURI and virSaveURI were added. These function are wrappers around xmlParseURI and xmlSaveUri respectively. Also there is one new syntax check function to prohibit these functions anywhere else. File changes: - src/util/viruri.h -- declaration - src/util/viruri.c -- definition - src/libvirt_private.syms -- symbol export - src/Makefile.am -- added source and header files - cfg.mk -- added sc_prohibit_xmlURI - all others -- ID name and include fixes 2012-02-24 18:48:55 +00:00			`/*`
			`* viruri.h: internal definitions used for URI parsing.`
			`*`
			`* Copyright (C) 2012 Red Hat, Inc.`
			`*`
			`* See COPYING.LIB for the License of this software`
			`*/`

			`#ifndef __VIR_URI_H__`
			`# define __VIR_URI_H__`

			`# include <libxml/uri.h>`

			`# include "internal.h"`

			`typedef xmlURI virURI;`
			`typedef xmlURIPtr virURIPtr;`

			`virURIPtr virURIParse(const char *uri);`
			`char *virURIFormat(virURIPtr uri);`

Use virURIFree instead of xmlFreeURI Since we defined a custom virURIPtr type, we should use a virURIFree method instead of assuming it will always be a typedef for xmlURIPtr * src/util/viruri.c, src/util/viruri.h, src/libvirt_private.syms: Add a virURIFree method * src/datatypes.c, src/esx/esx_driver.c, src/libvirt.c, src/qemu/qemu_migration.c, src/vmx/vmx.c, src/xen/xend_internal.c, tests/viruritest.c: s/xmlFreeURI/virURIFree/ Signed-off-by: Daniel P. Berrange <berrange@redhat.com> 2012-03-20 11:59:42 +00:00			`void virURIFree(virURIPtr uri);`

Fixed URI parsing Function xmlParseURI does not remove square brackets around IPv6 address when parsing. One of the solutions is making wrappers around functions working with xmlURI*. This assures that uri->server will be always properly assigned and it doesn't have to be changed when used on some new place in the code. For this purpose, functions virParseURI and virSaveURI were added. These function are wrappers around xmlParseURI and xmlSaveUri respectively. Also there is one new syntax check function to prohibit these functions anywhere else. File changes: - src/util/viruri.h -- declaration - src/util/viruri.c -- definition - src/libvirt_private.syms -- symbol export - src/Makefile.am -- added source and header files - cfg.mk -- added sc_prohibit_xmlURI - all others -- ID name and include fixes 2012-02-24 18:48:55 +00:00			`#endif /* __VIR_URI_H__ */`