From 6199af00cb47df6347ecd72ff7f6c86a564cec57 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 19 Feb 2010 12:06:18 -0500 Subject: Remove xprintf.c from the old "I can't believe it's not an X Server" tools. --- src/reg_dumper/Makefile.am | 3 +-- src/reg_dumper/xprintf.c | 58 ---------------------------------------------- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 src/reg_dumper/xprintf.c diff --git a/src/reg_dumper/Makefile.am b/src/reg_dumper/Makefile.am index f0bca558..6354334d 100644 --- a/src/reg_dumper/Makefile.am +++ b/src/reg_dumper/Makefile.am @@ -10,8 +10,7 @@ intel_gtt_SOURCES = \ intel_hotplug_SOURCES = \ hotplug.c \ - reg_dumper.h \ - xprintf.c + reg_dumper.h intel_lid_SOURCES = \ lid.c \ diff --git a/src/reg_dumper/xprintf.c b/src/reg_dumper/xprintf.c deleted file mode 100644 index 7b8ac997..00000000 --- a/src/reg_dumper/xprintf.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2004 Alexander Gottwald - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name(s) of the above copyright - * holders shall not be used in advertising or otherwise to promote the sale, - * use or other dealings in this Software without prior written authorization. - */ - -#include -#include -#include "reg_dumper.h" - -static char *XNFvprintf(const char *format, va_list va) -{ - char *ret; - int size; - va_list va2; - - va_copy(va2, va); - size = vsnprintf(NULL, 0, format, va2); - va_end(va2); - - ret = (char *)malloc(size + 1); - if (ret == NULL) - return NULL; - - vsnprintf(ret, size + 1, format, va); - ret[size] = 0; - return ret; -} - -char *XNFprintf(const char *format, ...) -{ - char *ret; - va_list va; - va_start(va, format); - ret = XNFvprintf(format, va); - va_end(va); - return ret; -} -- cgit v1.2.3