← Back to branch summary

~serge-hallyn/ubuntu/raring/libvirt/libvirt-virbr0

« back to all changes in this revision

Viewing changes to src/util/buf.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/util/buf.c
1
1
/*
2
2
 * buf.c: buffers for libvirt
3
3
 *
4
 
 * Copyright (C) 2005-2008, 2010-2011 Red Hat, Inc.
 
4
 * Copyright (C) 2005-2008, 2010-2012 Red Hat, Inc.
5
5
 *
6
6
 * See COPYING.LIB for the License of this software
7
7
 *
423
423
                     const char *format,
424
424
                     const char *str)
425
425
{
426
 
    virBufferEscape(buf, "\\'", format, str);
 
426
    virBufferEscape(buf, '\\', "\\'", format, str);
427
427
}
428
428
 
429
429
/**
430
430
 * virBufferEscape:
431
431
 * @buf: the buffer to append to
 
432
 * @escape: the escape character to inject
432
433
 * @toescape: NUL-terminated list of characters to escape
433
434
 * @format: a printf like format string but with only one %s parameter
434
435
 * @str: the string argument which needs to be escaped
435
436
 *
436
437
 * Do a formatted print with a single string to a buffer.  Any characters
437
 
 * in the provided list are escaped with a preceeding \.  Auto indentation
 
438
 * in the provided list are escaped with the given escape.  Auto indentation
438
439
 * may be applied.
439
440
 */
440
441
void
441
 
virBufferEscape(virBufferPtr buf, const char *toescape,
 
442
virBufferEscape(virBufferPtr buf, char escape, const char *toescape,
442
443
                const char *format, const char *str)
443
444
{
444
445
    int len;
471
472
         */
472
473
        char needle[2] = { *cur, 0 };
473
474
        if (strstr(toescape, needle))
474
 
            *out++ = '\\';
 
475
            *out++ = escape;
475
476
        *out++ = *cur;
476
477
        cur++;
477
478
    }