2008-01-29 20:42:39 +03:00
# This is reported not to work with make-3.79.1
# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
ME := Makefile.maint
# Do not save the original name or timestamp in the .tar.gz file.
# Use --rsyncable if available.
gzip_rsyncable := \
$( shell gzip --help 2>/dev/null| grep rsyncable >/dev/null && echo --rsyncable)
GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
2008-03-24 13:20:15 +03:00
VC_LIST = build-aux/vc-list-files
2008-01-29 20:42:39 +03:00
2008-03-24 13:20:15 +03:00
VC_LIST_EXCEPT = \
$( VC_LIST) | if test -f .x-$@ ; then grep -vEf .x-$@ ; else grep -v ChangeLog; fi
2008-01-29 20:42:39 +03:00
# Prevent programs like 'sort' from considering distinct strings to be equal.
# Doing it here saves us from having to set LC_ALL elsewhere in this file.
export LC_ALL = C
# Collect the names of rules starting with `sc_'.
2008-03-24 13:20:15 +03:00
syntax-check-rules := $( shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' \
$( srcdir) /$( ME) )
2008-01-29 20:42:39 +03:00
.PHONY : $( syntax -check -rules )
local-checks-available = \
po-check copyright-check m4-check author_mark_check \
2008-03-24 13:20:15 +03:00
patch-check strftime-check $( syntax-check-rules) \
2008-01-29 20:42:39 +03:00
makefile_path_separator_check \
makefile-check check-AUTHORS
.PHONY : $( local -checks -available )
local-check := $( filter-out $( local-checks-to-skip) , $( local-checks-available) )
syntax-check : $( local -check )
2008-03-24 13:20:15 +03:00
# @grep -nE '# *include <(limits|std(def|arg|bool))\.h>' \
# $$(find -type f -name '*.[chly]') && \
# { echo '$(ME): found conditional include' 1>&2; \
# exit 1; } || :
2008-01-29 20:42:39 +03:00
2008-03-24 13:20:15 +03:00
# grep -nE '^# *include <(string|stdlib)\.h>' \
# $(srcdir)/{lib,src}/*.[chy] && \
# { echo '$(ME): FIXME' 1>&2; \
# exit 1; } || :
# FIXME: don't allow `#include .strings\.h' anywhere
2008-01-29 20:42:39 +03:00
sc_avoid_if_before_free :
2008-02-07 19:49:29 +03:00
@$( srcdir) /build-aux/useless-if-before-free \
$( useless_free_options) \
2008-03-24 13:20:15 +03:00
$$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): found useless "if" before "free" above' 1>& 2; \
exit 1; } || :
Use safewrite in place of write, in many cases.
Also add "make syntax-check" rules to ensure no new uses sneak in.
There are many uses of write like this:
if (write (fd, xml, towrite) != towrite)
return -1;
The problem is that the syscall can succeed, yet write less than
the requested number of bytes, so the caller should retry
rather than simply failing.
This patch changes most of them to use util.c's safewrite wrapper,
which encapsulates the process. Also, there were a few cases in
which the retry loop was open-coded, and I replaced those, too.
* Makefile.maint (sc_avoid_write): New rule, to avoid recurrence.
* .x-sc_avoid_write: New file. Record two legitimate exemptions.
* qemud/qemud.c (sig_handler, qemudClientWriteBuf): Use safewrite, not write.
* src/conf.c (__virConfWriteFile): Likewise.
* src/qemu_conf.c (qemudSaveConfig, qemudSaveNetworkConfig): Likewise.
* src/qemu_driver.c (qemudWaitForMonitor, qemudStartVMDaemon)
(qemudVMData, PROC_IP_FORWARD): Likewise.
* proxy/libvirt_proxy.c: Include "util.h".
(proxyWriteClientSocket): Use safewrite.
* src/test.c (testDomainSave, testDomainCoreDump): Likewise.
* src/proxy_internal.c (virProxyWriteClientSocket): Likewise.
* src/virsh.c: Include "util-lib.h".
(vshOutputLogFile): Use safewrite.
* src/console.c: Include "util-lib.h".
(vshRunConsole): Use safewrite.
2008-02-22 18:55:04 +03:00
# Avoid uses of write(2). Either switch to streams (fwrite), or use
# the safewrite wrapper.
sc_avoid_write :
2008-03-24 13:20:15 +03:00
@if $( VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \
grep '\<write *(' $$ ( $( VC_LIST_EXCEPT) | grep '\.c$$' ) && \
Use safewrite in place of write, in many cases.
Also add "make syntax-check" rules to ensure no new uses sneak in.
There are many uses of write like this:
if (write (fd, xml, towrite) != towrite)
return -1;
The problem is that the syscall can succeed, yet write less than
the requested number of bytes, so the caller should retry
rather than simply failing.
This patch changes most of them to use util.c's safewrite wrapper,
which encapsulates the process. Also, there were a few cases in
which the retry loop was open-coded, and I replaced those, too.
* Makefile.maint (sc_avoid_write): New rule, to avoid recurrence.
* .x-sc_avoid_write: New file. Record two legitimate exemptions.
* qemud/qemud.c (sig_handler, qemudClientWriteBuf): Use safewrite, not write.
* src/conf.c (__virConfWriteFile): Likewise.
* src/qemu_conf.c (qemudSaveConfig, qemudSaveNetworkConfig): Likewise.
* src/qemu_driver.c (qemudWaitForMonitor, qemudStartVMDaemon)
(qemudVMData, PROC_IP_FORWARD): Likewise.
* proxy/libvirt_proxy.c: Include "util.h".
(proxyWriteClientSocket): Use safewrite.
* src/test.c (testDomainSave, testDomainCoreDump): Likewise.
* src/proxy_internal.c (virProxyWriteClientSocket): Likewise.
* src/virsh.c: Include "util-lib.h".
(vshOutputLogFile): Use safewrite.
* src/console.c: Include "util-lib.h".
(vshRunConsole): Use safewrite.
2008-02-22 18:55:04 +03:00
{ echo " $( ME) : the above files use write; " \
" consider using the safewrite wrapper instead" \
1>& 2; exit 1; } || :; \
else :; \
fi
2008-01-29 20:42:39 +03:00
sc_cast_of_argument_to_free :
2008-03-24 13:20:15 +03:00
@grep -nE '\<free \(\(' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): don' \' 't cast free argument' 1>& 2; \
exit 1; } || :
sc_cast_of_x_alloc_return_value :
2008-03-24 13:20:15 +03:00
@grep -nE '\*\) *x(m|c|re)alloc\>' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): don' \' 't cast x*alloc return value' 1>& 2; \
exit 1; } || :
sc_cast_of_alloca_return_value :
2008-03-24 13:20:15 +03:00
@grep -nE '\*\) *alloca\>' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): don' \' 't cast alloca return value' 1>& 2; \
exit 1; } || :
sc_space_tab :
2008-03-24 13:20:15 +03:00
@grep -n '[ ] ' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): found SPACE-TAB sequence; remove the SPACE' \
1>& 2; exit 1; } || :
# Don't use *scanf or the old ato* functions in `real' code.
# They provide no error checking mechanism.
# Instead, use strto* functions.
sc_prohibit_atoi_atof :
2008-03-24 13:20:15 +03:00
@grep -nE '\<([fs]?scanf|ato([filq]|ll))\>' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): do not use *scan' 'f, ato' 'f, ato' 'i, ato' 'l, ato' 'll, ato' 'q, or ss' 'canf' \
1>& 2; exit 1; } || :
# Use STREQ rather than comparing strcmp == 0, or != 0.
sc_prohibit_strcmp :
2008-03-24 13:20:15 +03:00
@grep -nE '! *str' 'cmp \(|\<str' 'cmp \([^)]+\) *==' \
$$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): use STREQ in place of the above uses of str' 'cmp' \
1>& 2; exit 1; } || :
# Using EXIT_SUCCESS as the first argument to error is misleading,
# since when that parameter is 0, error does not exit. Use `0' instead.
sc_error_exit_success :
@grep -nF 'error (EXIT_SUCCESS,' \
$$ ( find -type f -name '*.[chly]' ) && \
{ echo '$(ME): found error (EXIT_SUCCESS' 1>& 2; \
exit 1; } || :
sc_file_system :
2008-03-24 13:20:15 +03:00
@grep -ni 'file' 'system' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): found use of "file' 'system";' \
'rewrite to use "file system"' 1>& 2; \
exit 1; } || :
sc_no_have_config_h :
2008-03-24 13:20:15 +03:00
@grep -n '^# *if.*HAVE' '_CONFIG_H' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): found use of HAVE' '_CONFIG_H; remove' \
1>& 2; exit 1; } || :
# Nearly all .c files must include <config.h>.
sc_require_config_h :
2008-03-24 13:20:15 +03:00
@if $( VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \
2008-01-29 20:42:39 +03:00
grep -L '^# *include <config\.h>' \
2008-03-24 13:20:15 +03:00
$$ ( $( VC_LIST_EXCEPT) | grep '\.c$$' ) \
2008-01-29 20:42:39 +03:00
| grep . && \
{ echo '$(ME): the above files do not include <config.h>' \
1>& 2; exit 1; } || :; \
else :; \
fi
2008-03-24 13:20:15 +03:00
# To use this "command" macro, you must first define two shell variables:
# h: the header, enclosed in <> or ""
# re: a regular expression that matches IFF something provided by $h is used.
d e f i n e _ h e a d e r _ w i t h o u t _ u s e
h_esc = ` echo " $$ h " | sed 's/\./\\./' ` ; \
if $( VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \
files = $$ ( grep -l '^# *include ' " $$ h_esc " \
$$ ( $( VC_LIST_EXCEPT) | grep '\.c$$' ) ) && \
grep -LE " $$ re " $$ files | grep . && \
{ echo " $( ME) : the above files include $$ h but don't use it " \
1>& 2; exit 1; } || :; \
else :; \
fi
e n d e f
2008-01-29 20:42:39 +03:00
# Prohibit the inclusion of assert.h without an actual use of assert.
sc_prohibit_assert_without_use :
2008-03-24 13:20:15 +03:00
@h= '<assert.h>' re = '\<assert *\(' $( _header_without_use)
# Prohibit the inclusion of getopt.h without an actual use.
sc_prohibit_getopt_without_use :
@h= '<getopt.h>' re = '\<getopt(_long)? *\(' $( _header_without_use)
2008-01-29 20:42:39 +03:00
# Don't include quotearg.h unless you use one of its functions.
sc_prohibit_quotearg_without_use :
2008-03-24 13:20:15 +03:00
@h= '"quotearg.h"' re = '\<quotearg(_[^ ]+)? *\(' $( _header_without_use)
2008-01-29 20:42:39 +03:00
# Don't include quote.h unless you use one of its functions.
sc_prohibit_quote_without_use :
2008-03-24 13:20:15 +03:00
@h= '"quote.h"' re = '\<quote(_n)? *\(' $( _header_without_use)
2008-01-29 20:42:39 +03:00
sc_obsolete_symbols :
@grep -nE '\<(HAVE' '_FCNTL_H|O' '_NDELAY)\>' \
2008-03-24 13:20:15 +03:00
$$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): do not use HAVE' '_FCNTL_H or O' '_NDELAY' \
1>& 2; exit 1; } || :
# FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ
# Each nonempty line must start with a year number, or a TAB.
sc_changelog :
@grep -n '^[^12 ]' $$ ( find . -maxdepth 2 -name ChangeLog) && \
{ echo '$(ME): found unexpected prefix in a ChangeLog' 1>& 2; \
exit 1; } || :
# Ensure that dd's definition of LONGEST_SYMBOL stays in sync
# with the strings from the two affected variables.
dd_c = $( srcdir) /src/dd.c
sc_dd_max_sym_length :
i f n e q ( $( wildcard $ ( dd_c ) ) , )
@len= $$ ( ( sed -n '/conversions\[\] =$$/,/^};/p' $( dd_c) ; \
sed -n '/flags\[\] =$$/,/^};/p' $( dd_c) ) \
| sed -n '/"/s/^[^"]*"\([^"]*\)".*/\1/p' \
| wc --max-line-length) ; \
max = $$ ( sed -n '/^#define LONGEST_SYMBOL /s///p' $( dd_c) \
| tr -d '"' | wc --max-line-length) ; \
if test " $$ len " = " $$ max " ; then :; else \
echo 'dd.c: LONGEST_SYMBOL is not longest' 1>& 2; \
exit 1; \
fi
e n d i f
# Many m4 macros names once began with `jm_'.
# On 2004-04-13, they were all changed to start with gl_ instead.
# Make sure that none are inadvertently reintroduced.
sc_prohibit_jm_in_m4 :
@grep -nE 'jm_[A-Z]' \
2008-03-24 13:20:15 +03:00
$$ ( $( VC_LIST) m4 | grep '\.m4$$' ; echo /dev/null) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): do not use jm_ in m4 macro names' \
1>& 2; exit 1; } || :
sc_root_tests :
@if test -d tests \
&& grep check-root tests/Makefile.am>/dev/null 2>& 1; then \
t1 = sc-root.expected; t2 = sc-root.actual; \
2008-03-24 13:20:15 +03:00
grep -nl '^require_root_$$' \
$$ ( $( VC_LIST) tests) | sed s,tests,., | sort > $$ t1; \
2008-01-29 20:42:39 +03:00
sed -n 's, cd \([^ ]*\) .*MAKE..check TESTS=\(.*\),./\1/\2,p' \
$( srcdir) /tests/Makefile.am | sort > $$ t2; \
diff -u $$ t1 $$ t2 || diff = 1; \
rm -f $$ t1 $$ t2; \
test " $$ diff " \
&& { echo 'tests/Makefile.am: missing check-root action' >& 2; \
exit 1; } || :; \
fi
headers_with_interesting_macro_defs = \
exit.h \
fcntl_.h \
fnmatch_.h \
intprops.h \
inttypes_.h \
lchown.h \
openat.h \
stat-macros.h \
stdint_.h
# Create a list of regular expressions matching the names
# of macros that are guaranteed by parts of gnulib to be defined.
.re-defmac :
@( cd $( srcdir) /lib; \
for f in $( headers_with_interesting_macro_defs) ; do \
test -f $$ f && \
sed -n '/^# *define \([^_ (][^ (]*\)[ (].*/s//\1/p' $$ f; \
done ; \
) | sort -u \
| grep -Ev 'ATTRIBUTE_NORETURN|SIZE_MAX' \
| sed 's/^/^# *define /' \
> $@ -t
@mv $@ -t $@
# Don't define macros that we already get from gnulib header files.
sc_always_defined_macros : .re -defmac
@if test -f $( srcdir) /src/system.h; then \
trap 'rc=$$?; rm -f .re-defmac; exit $$rc' 0 1 2 3 15; \
2008-03-24 13:20:15 +03:00
grep -f .re-defmac $$ ( $( VC_LIST) ) \
2008-01-29 20:42:39 +03:00
&& { echo '$(ME): define the above via some gnulib .h file' \
1>& 2; exit 1; } || :; \
fi
# Create a list of regular expressions matching the names
# of files included from system.h. Exclude a couple.
.re-list :
@sed -n '/^# *include /s///p' $( srcdir) /src/system.h \
| grep -Ev 'sys/(param|file)\.h' \
| sed 's/ .*//;;s/^["<]/^# *include [<"]/;s/\.h[">]$$/\\.h[">]/' \
> $@ -t
@mv $@ -t $@
# Files in src/ should not include directly any of
# the headers already included via system.h.
sc_system_h_headers : .re -list
@if test -f $( srcdir) /src/system.h; then \
trap 'rc=$$?; rm -f .re-list; exit $$rc' 0 1 2 3 15; \
grep -nE -f .re-list \
2008-03-24 13:20:15 +03:00
$$ ( $( VC_LIST) src | \
2008-01-29 20:42:39 +03:00
grep -Ev '((copy|system)\.h|parse-gram\.c)$$' ) \
&& { echo '$(ME): the above are already included via system.h' \
1>& 2; exit 1; } || :; \
fi
sc_sun_os_names :
@grep -nEi \
'solaris[^[:alnum:]]*2\.(7|8|9|[1-9][0-9])|sunos[^[:alnum:]][6-9]' \
2008-03-24 13:20:15 +03:00
$$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): found misuse of Sun OS version numbers' 1>& 2; \
exit 1; } || :
sc_the_the :
2008-03-24 13:20:15 +03:00
@grep -ni '\<the ' 'the\>' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): found use of "the ' 'the";' 1>& 2; \
exit 1; } || :
sc_tight_scope :
$( MAKE) -C src $@
sc_trailing_blank :
2008-03-24 13:20:15 +03:00
@grep -n '[ ]$$' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): found trailing blank(s)' \
1>& 2; exit 1; } || :
# Match lines like the following, but where there is only one space
# between the options and the description:
# -D, --all-repeated[=delimit-method] print all duplicate lines\n
longopt_re = --[ a-z] [ 0-9A-Za-z-] *( \[ ?= [ 0-9A-Za-z-] *\] ?) ?
sc_two_space_separator_in_usage :
@grep -nE '^ *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$' \
2008-03-24 13:20:15 +03:00
$$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo " $( ME) : help2man requires at least two spaces between " ; \
echo " $( ME) : an option and its description " ; \
1>& 2; exit 1; } || :
Mark many more strings for translation.
* Makefile.maint (err_func_re): Add to the list and make it readable.
* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
* src/storage_backend.c: Fix comment.
* src/util.c (virFileLinkPointsTo): Mark a string.
* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
(remoteDispatchDomainGetSchedulerType): Likewise.
(remoteDispatchDomainGetSchedulerParameters): Likewise.
(remoteDispatchDomainSetSchedulerParameters): Likewise.
(remoteDispatchDomainBlockStats): Likewise.
(remoteDispatchDomainInterfaceStats): Likewise.
(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
(remoteDispatchDomainGetVcpus): Likewise.
(remoteDispatchDomainMigratePerform): Likewise.
(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
(remoteDispatchDomainReboot, remoteDispatchDomainResume):
(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
(remoteDispatchDomainSetAutostart): Likewise.
(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
(remoteDispatchStoragePoolGetAutostart): Likewise.
(remoteDispatchStoragePoolSetAutostart):
(remoteDispatchStoragePoolListVolumes):
(remoteDispatchStoragePoolNumOfVolumes):
(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
(remoteDispatchStorageVolLookupByName): Likewise.
* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
(qemudDomainGetOSType, qemudDomainSetMaxMemory):
(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
(qemudDomainUndefine, qemudDomainChangeCDROM):
(qemudDomainAttachDevice, qemudDomainGetAutostart):
(qemudDomainSetAutostart, qemudDomainInterfaceStats):
(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
(qemudNetworkDumpXML, qemudNetworkGetAutostart):
(qemudNetworkSetAutostart): Likewise.
* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu): Likewise.
2008-03-27 16:43:01 +03:00
msg_gen_function =
msg_gen_function += DISABLE_fprintf
msg_gen_function += virXendError
msg_gen_function += virXMLError
msg_gen_function += virHashError
msg_gen_function += virConfError
msg_gen_function += virTestError
msg_gen_function += virLibConnError
msg_gen_function += virStorageReportError
msg_gen_function += virxmlRpcError
msg_gen_function += virLog
msg_gen_function += qemudLog
msg_gen_function += remoteDispatchError
msg_gen_function += virStorageLog
2008-03-27 16:45:26 +03:00
msg_gen_function += xenXMError
2008-03-27 16:47:00 +03:00
msg_gen_function += ReportError
qemudReportError: mark for translation string args to this function
* Makefile.maint (msg_gen_function): Add qemudReportError.
* src/qemu_conf.c (qemudLoadDriverConfig)
(qemudExtractVersion, qemudParseDiskXML, qemudParseInterfaceXML)
(qemudParseInputXML, qemudParseXML, qemudNetworkIfaceConnect)
(qemudBuildCommandLine, qemudSaveConfig, qemudParseVMDeviceDef)
(qemudAssignVMDef, qemudSaveVMDef, qemudSaveNetworkConfig)
(qemudParseDhcpRangesXML, qemudParseNetworkXML)
(qemudAssignNetworkDef, qemudSaveNetworkDef, qemudGenerateXML)
(qemudGenerateNetworkXML, qemudDeleteConfig): Mark strings.
* src/qemu_driver.c (qemudBuildDnsmasqArgv, qemudAddIptablesRules)
(qemudGetCapabilities, qemudDomainGetOSType)
(qemudListDefinedDomains, qemudListNetworks)
(qemudListDefinedNetworks, qemudNetworkGetBridgeName): Mark strings.
2008-03-27 16:53:14 +03:00
msg_gen_function += qemudReportError
2008-03-27 17:00:28 +03:00
msg_gen_function += openvzLog
Mark many more strings for translation.
* Makefile.maint (err_func_re): Add to the list and make it readable.
* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
* src/storage_backend.c: Fix comment.
* src/util.c (virFileLinkPointsTo): Mark a string.
* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
(remoteDispatchDomainGetSchedulerType): Likewise.
(remoteDispatchDomainGetSchedulerParameters): Likewise.
(remoteDispatchDomainSetSchedulerParameters): Likewise.
(remoteDispatchDomainBlockStats): Likewise.
(remoteDispatchDomainInterfaceStats): Likewise.
(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
(remoteDispatchDomainGetVcpus): Likewise.
(remoteDispatchDomainMigratePerform): Likewise.
(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
(remoteDispatchDomainReboot, remoteDispatchDomainResume):
(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
(remoteDispatchDomainSetAutostart): Likewise.
(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
(remoteDispatchStoragePoolGetAutostart): Likewise.
(remoteDispatchStoragePoolSetAutostart):
(remoteDispatchStoragePoolListVolumes):
(remoteDispatchStoragePoolNumOfVolumes):
(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
(remoteDispatchStorageVolLookupByName): Likewise.
* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
(qemudDomainGetOSType, qemudDomainSetMaxMemory):
(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
(qemudDomainUndefine, qemudDomainChangeCDROM):
(qemudDomainAttachDevice, qemudDomainGetAutostart):
(qemudDomainSetAutostart, qemudDomainInterfaceStats):
(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
(qemudNetworkDumpXML, qemudNetworkGetAutostart):
(qemudNetworkSetAutostart): Likewise.
* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu): Likewise.
2008-03-27 16:43:01 +03:00
2008-03-27 17:01:59 +03:00
# Uncomment the following and run "make syntax-check" to see diagnostics
# that are not yet marked for translation, but that need to be rewritten
# so that they are translatable.
error: mark most string arguments for translation
Also mark some arguments to __virRaiseError.
* Makefile.maint (msg_gen_function): Add error.
* po/POTFILES.in: Add src/openvz_conf.c and src/openvz_driver.c.
* src/openvz_conf.c (openvzParseXML, openvzGetVPSInfo): Mark strings.
* src/openvz_driver.c (openvzDomainLookupByID): Likewise.
(openvzDomainLookupByUUID, openvzDomainLookupByName): Likewise.
(openvzDomainGetInfo, openvzDomainShutdown, openvzDomainReboot)
(openvzDomainCreate, openvzDomainUndefine): Likewise.
* src/remote_internal.c (check_cert_file): Likewise.
(negotiate_gnutls_on_connection, verify_certificate): Likewise.
(remoteAuthenticate, addrToString, remoteAuthSASL): Likewise.
(remoteAuthPolkit, call, really_read_buf): Likewise.
2008-03-27 16:58:56 +03:00
# msg_gen_function += error
Mark many more strings for translation.
* Makefile.maint (err_func_re): Add to the list and make it readable.
* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
* src/storage_backend.c: Fix comment.
* src/util.c (virFileLinkPointsTo): Mark a string.
* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
(remoteDispatchDomainGetSchedulerType): Likewise.
(remoteDispatchDomainGetSchedulerParameters): Likewise.
(remoteDispatchDomainSetSchedulerParameters): Likewise.
(remoteDispatchDomainBlockStats): Likewise.
(remoteDispatchDomainInterfaceStats): Likewise.
(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
(remoteDispatchDomainGetVcpus): Likewise.
(remoteDispatchDomainMigratePerform): Likewise.
(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
(remoteDispatchDomainReboot, remoteDispatchDomainResume):
(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
(remoteDispatchDomainSetAutostart): Likewise.
(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
(remoteDispatchStoragePoolGetAutostart): Likewise.
(remoteDispatchStoragePoolSetAutostart):
(remoteDispatchStoragePoolListVolumes):
(remoteDispatchStoragePoolNumOfVolumes):
(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
(remoteDispatchStorageVolLookupByName): Likewise.
* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
(qemudDomainGetOSType, qemudDomainSetMaxMemory):
(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
(qemudDomainUndefine, qemudDomainChangeCDROM):
(qemudDomainAttachDevice, qemudDomainGetAutostart):
(qemudDomainSetAutostart, qemudDomainInterfaceStats):
(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
(qemudNetworkDumpXML, qemudNetworkGetAutostart):
(qemudNetworkSetAutostart): Likewise.
* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu): Likewise.
2008-03-27 16:43:01 +03:00
# msg_gen_function += virXenError
# msg_gen_function += testError
2008-03-27 17:02:57 +03:00
# msg_gen_function += lxcError
Mark many more strings for translation.
* Makefile.maint (err_func_re): Add to the list and make it readable.
* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
* src/storage_backend.c: Fix comment.
* src/util.c (virFileLinkPointsTo): Mark a string.
* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
(remoteDispatchDomainGetSchedulerType): Likewise.
(remoteDispatchDomainGetSchedulerParameters): Likewise.
(remoteDispatchDomainSetSchedulerParameters): Likewise.
(remoteDispatchDomainBlockStats): Likewise.
(remoteDispatchDomainInterfaceStats): Likewise.
(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
(remoteDispatchDomainGetVcpus): Likewise.
(remoteDispatchDomainMigratePerform): Likewise.
(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
(remoteDispatchDomainReboot, remoteDispatchDomainResume):
(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
(remoteDispatchDomainSetAutostart): Likewise.
(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
(remoteDispatchStoragePoolGetAutostart): Likewise.
(remoteDispatchStoragePoolSetAutostart):
(remoteDispatchStoragePoolListVolumes):
(remoteDispatchStoragePoolNumOfVolumes):
(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
(remoteDispatchStorageVolLookupByName): Likewise.
* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
(qemudDomainGetOSType, qemudDomainSetMaxMemory):
(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
(qemudDomainUndefine, qemudDomainChangeCDROM):
(qemudDomainAttachDevice, qemudDomainGetAutostart):
(qemudDomainSetAutostart, qemudDomainInterfaceStats):
(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
(qemudNetworkDumpXML, qemudNetworkGetAutostart):
(qemudNetworkSetAutostart): Likewise.
* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu): Likewise.
2008-03-27 16:43:01 +03:00
func_or := $( shell printf '$(msg_gen_function)' | tr -s '[[:space:]]' '|' )
func_re := ( $( func_or) )
2008-02-04 22:31:30 +03:00
2008-01-29 20:42:39 +03:00
# Look for diagnostics that aren't marked for translation.
# This won't find any for which error's format string is on a separate line.
2008-02-25 13:00:16 +03:00
# The sed filters eliminate false-positives like these:
# _("...: "
# "%s", _("no storage vol w..."
2008-01-29 20:42:39 +03:00
sc_unmarked_diagnostics :
@grep -nE \
Mark many more strings for translation.
* Makefile.maint (err_func_re): Add to the list and make it readable.
* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
* src/storage_backend.c: Fix comment.
* src/util.c (virFileLinkPointsTo): Mark a string.
* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
(remoteDispatchDomainGetSchedulerType): Likewise.
(remoteDispatchDomainGetSchedulerParameters): Likewise.
(remoteDispatchDomainSetSchedulerParameters): Likewise.
(remoteDispatchDomainBlockStats): Likewise.
(remoteDispatchDomainInterfaceStats): Likewise.
(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
(remoteDispatchDomainGetVcpus): Likewise.
(remoteDispatchDomainMigratePerform): Likewise.
(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
(remoteDispatchDomainReboot, remoteDispatchDomainResume):
(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
(remoteDispatchDomainSetAutostart): Likewise.
(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
(remoteDispatchStoragePoolGetAutostart): Likewise.
(remoteDispatchStoragePoolSetAutostart):
(remoteDispatchStoragePoolListVolumes):
(remoteDispatchStoragePoolNumOfVolumes):
(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
(remoteDispatchStorageVolLookupByName): Likewise.
* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
(qemudDomainGetOSType, qemudDomainSetMaxMemory):
(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
(qemudDomainUndefine, qemudDomainChangeCDROM):
(qemudDomainAttachDevice, qemudDomainGetAutostart):
(qemudDomainSetAutostart, qemudDomainInterfaceStats):
(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
(qemudNetworkDumpXML, qemudNetworkGetAutostart):
(qemudNetworkSetAutostart): Likewise.
* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu): Likewise.
2008-03-27 16:43:01 +03:00
'\<$(func_re) \([^"]*"[^"]*[a-z]{3}' $$ ( $( VC_LIST_EXCEPT) ) \
2008-01-29 20:42:39 +03:00
| grep -v '_' '(' && \
{ echo '$(ME): found unmarked diagnostic(s)' 1>& 2; \
exit 1; } || :
Mark many more strings for translation.
* Makefile.maint (err_func_re): Add to the list and make it readable.
* po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort.
* src/storage_backend.c: Fix comment.
* src/util.c (virFileLinkPointsTo): Mark a string.
* qemud/remote.c (remoteDispatchClientRequest): Mark strings.
(remoteDispatchOpen, CHECK_CONN, remoteDispatchGetType): Likewise.
(remoteDispatchDomainGetSchedulerType): Likewise.
(remoteDispatchDomainGetSchedulerParameters): Likewise.
(remoteDispatchDomainSetSchedulerParameters): Likewise.
(remoteDispatchDomainBlockStats): Likewise.
(remoteDispatchDomainInterfaceStats): Likewise.
(remoteDispatchDomainAttachDevice, remoteDispatchDomainCreate):
(remoteDispatchDomainDestroy, remoteDispatchDomainDetachDevice):
(remoteDispatchDomainDumpXml, remoteDispatchDomainGetAutostart):
(remoteDispatchDomainGetInfo, remoteDispatchDomainGetMaxMemory):
(remoteDispatchDomainGetMaxVcpus, remoteDispatchDomainGetOsType):
(remoteDispatchDomainGetVcpus): Likewise.
(remoteDispatchDomainMigratePerform): Likewise.
(remoteDispatchListDefinedDomains, remoteDispatchDomainPinVcpu):
(remoteDispatchDomainReboot, remoteDispatchDomainResume):
(remoteDispatchDomainSave, remoteDispatchDomainCoreDump):
(remoteDispatchDomainSetAutostart): Likewise.
(remoteDispatchDomainSetMaxMemory, remoteDispatchDomainSetMemory):
(remoteDispatchDomainSetVcpus, remoteDispatchDomainShutdown):
(remoteDispatchDomainSuspend, remoteDispatchDomainUndefine):
(remoteDispatchListDefinedNetworks, remoteDispatchListDomains):
(remoteDispatchListNetworks, remoteDispatchNetworkCreate):
(remoteDispatchNetworkDestroy, remoteDispatchNetworkDumpXml):
(remoteDispatchNetworkGetAutostart, remoteDispatchNetworkGetBridgeName):
(remoteDispatchNetworkSetAutostart, remoteDispatchNetworkUndefine):
(addrToString, remoteDispatchAuthSaslInit, remoteDispatchAuthSaslStart):
(remoteDispatchAuthSaslStep, remoteDispatchListDefinedStoragePools):
(remoteDispatchListStoragePools, remoteDispatchStoragePoolCreate):
(remoteDispatchStoragePoolBuild, remoteDispatchStoragePoolDestroy):
(remoteDispatchStoragePoolDelete, remoteDispatchStoragePoolRefresh):
(remoteDispatchStoragePoolGetInfo, remoteDispatchStoragePoolDumpXml):
(remoteDispatchStoragePoolGetAutostart): Likewise.
(remoteDispatchStoragePoolSetAutostart):
(remoteDispatchStoragePoolListVolumes):
(remoteDispatchStoragePoolNumOfVolumes):
(remoteDispatchStoragePoolUndefine, remoteDispatchStorageVolCreateXml):
(remoteDispatchStorageVolDelete, remoteDispatchStorageVolGetInfo):
(remoteDispatchStorageVolDumpXml, remoteDispatchStorageVolGetPath):
(remoteDispatchStorageVolLookupByName): Likewise.
* src/qemu_driver.c (qemudOpenMonitor, qemudStartVMDaemon):
(dhcpStartDhcpDaemon, qemudStartNetworkDaemon):
(qemudDomainSuspend, qemudDomainResume, qemudDomainShutdown):
(qemudDomainGetOSType, qemudDomainSetMaxMemory):
(qemudDomainSetMemory, qemudDomainGetInfo, qemudDomainSave):
(qemudDomainRestore, qemudDomainDumpXML, qemudDomainStart):
(qemudDomainUndefine, qemudDomainChangeCDROM):
(qemudDomainAttachDevice, qemudDomainGetAutostart):
(qemudDomainSetAutostart, qemudDomainInterfaceStats):
(qemudNetworkLookupByUUID, qemudNetworkLookupByName):
(qemudNetworkUndefine, qemudNetworkStart, qemudNetworkDestroy):
(qemudNetworkDumpXML, qemudNetworkGetAutostart):
(qemudNetworkSetAutostart): Likewise.
* src/virsh.c (cmdVcpupin, cmdAttachDevice, cmdDetachDevice): Likewise.
* src/xm_internal.c (xenXMConfigCacheRefresh, xenXMDomainPinVcpu): Likewise.
2008-03-27 16:43:01 +03:00
@{ grep -nE '\<$(func_re) *\(.*;$$' $$ ( $( VC_LIST_EXCEPT) ) ; \
grep -A1 -nE '\<$(func_re) *\(.*,$$' $$ ( $( VC_LIST_EXCEPT) ) ; } \
2008-02-25 13:00:16 +03:00
| sed 's/_("[^"][^"]*"//;s/[ ]"%s"//' \
| grep '[ ]"' && \
2008-02-04 22:31:30 +03:00
{ echo '$(ME): found unmarked diagnostic(s)' 1>& 2; \
exit 1; } || :
2008-01-29 20:42:39 +03:00
Eliminate all uses of virBufferAdd with string literals.
* Makefile.maint (sc_prohibit_virBufferAdd_with_string_literal):
New rule.
* src/buf.h (virBufferAddLit): Define.
* src/conf.c (virConfSaveValue): Use virBufferAddLit, in place
of virBufferAdd everywhere possible.
(virConfSaveEntry): Likewise.
* src/qemu_conf.c (qemudGenerateXML, qemudGenerateNetworkXML): Likewise.
* src/qemu_driver.c (qemudGetFeatures, qemudGetCapabilities): Likewise.
* src/test.c (testDomainDumpXML, testNetworkDumpXML): Likewise.
* src/xen_internal.c (xenHypervisorMakeCapabilitiesXML): Likewise.
* src/xend_internal.c (xend_parse_sexp_desc_os): Likewise.
(xend_parse_sexp_desc, sexpr_to_xend_topology_xml): Likewise.
* src/xm_internal.c (xenXMDomainFormatXML, xenXMDomainPinVcpu): Likewise.
* src/xml.c (virSaveCpuSet, virParseXenCpuTopology): Likewise.
(virDomainParseXMLGraphicsDescImage): Likewise.
(virDomainParseXMLGraphicsDescVFB, virDomainParseXMLOSDescHVM): Likewise.
(virDomainParseXMLOSDescPV, virDomainParseXMLDiskDesc): Likewise.
(virDomainParseXMLIfDesc, virDomainParseXMLDesc): Likewise.
2008-02-05 17:22:28 +03:00
sc_prohibit_virBufferAdd_with_string_literal :
2008-03-24 13:20:15 +03:00
@grep -nE '\<virBufferAdd *\([^,]+, *"[^"]' $$ ( $( VC_LIST_EXCEPT) ) && \
Eliminate all uses of virBufferAdd with string literals.
* Makefile.maint (sc_prohibit_virBufferAdd_with_string_literal):
New rule.
* src/buf.h (virBufferAddLit): Define.
* src/conf.c (virConfSaveValue): Use virBufferAddLit, in place
of virBufferAdd everywhere possible.
(virConfSaveEntry): Likewise.
* src/qemu_conf.c (qemudGenerateXML, qemudGenerateNetworkXML): Likewise.
* src/qemu_driver.c (qemudGetFeatures, qemudGetCapabilities): Likewise.
* src/test.c (testDomainDumpXML, testNetworkDumpXML): Likewise.
* src/xen_internal.c (xenHypervisorMakeCapabilitiesXML): Likewise.
* src/xend_internal.c (xend_parse_sexp_desc_os): Likewise.
(xend_parse_sexp_desc, sexpr_to_xend_topology_xml): Likewise.
* src/xm_internal.c (xenXMDomainFormatXML, xenXMDomainPinVcpu): Likewise.
* src/xml.c (virSaveCpuSet, virParseXenCpuTopology): Likewise.
(virDomainParseXMLGraphicsDescImage): Likewise.
(virDomainParseXMLGraphicsDescVFB, virDomainParseXMLOSDescHVM): Likewise.
(virDomainParseXMLOSDescPV, virDomainParseXMLDiskDesc): Likewise.
(virDomainParseXMLIfDesc, virDomainParseXMLDesc): Likewise.
2008-02-05 17:22:28 +03:00
{ echo '$(ME): use virBufferAddLit, not virBufferAdd,' \
'with a string literal' 1>& 2; exit 1; } || :
2008-01-29 20:42:39 +03:00
# Avoid useless parentheses like those in this example:
# #if defined (SYMBOL) || defined (SYM2)
sc_useless_cpp_parens :
2008-03-24 13:20:15 +03:00
@grep -n '^# *if .*defined *(' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): found useless parentheses in cpp directive' \
1>& 2; exit 1; } || :
# Require the latest GPL.
sc_GPL_version :
2008-03-24 13:20:15 +03:00
@grep -n 'either ' 'version [^3]' $$ ( $( VC_LIST_EXCEPT) ) && \
2008-01-29 20:42:39 +03:00
{ echo '$(ME): GPL vN, N!=3' 1>& 2; exit 1; } || :
# Ensure that the c99-to-c89 patch applies cleanly.
patch-check :
rm -rf src-c89 $@ .1 $@ .2
cp -a src src-c89
( cd src-c89; patch -p1 -V never --fuzz= 0) < src/c99-to-c89.diff \
> $@ .1 2>& 1
if test " $$ REGEN_PATCH " = yes; then \
diff -upr src src-c89 | sed 's,src-c89/,src/,' \
| grep -v '^Only in' > new-diff || : ; fi
grep -v '^patching file ' $@ .1 > $@ .2 || :
msg = ok; test -s $@ .2 && msg = 'fuzzy patch' || : ; \
rm -f src-c89/*.o || msg = 'rm failed' ; \
$( MAKE) -C src-c89 CFLAGS = '-Wdeclaration-after-statement -Werror' \
|| msg = 'compile failure with extra options' ; \
test " $$ msg " = ok && rm -rf src-c89 $@ .1 $@ .2 || echo " $$ msg " 1>& 2; \
test " $$ msg " = ok
# Ensure that date's --help output stays in sync with the info
# documentation for GNU strftime. The only exception is %N,
# which date accepts but GNU strftime does not.
extract_char = sed 's/^[^%][^%]*%\(.\).*/\1/'
strftime-check :
if test -f $( srcdir) /src/date.c; then \
grep '^ %. ' $( srcdir) /src/date.c | sort \
| $( extract_char) > $@ -src; \
{ echo N; \
info libc date calendar format | grep '^ `%.' \' \
| $( extract_char) ; } | sort > $@ -info; \
diff -u $@ -src $@ -info || exit 1; \
rm -f $@ -src $@ -info; \
fi
check-AUTHORS :
$( MAKE) -C src $@
# Ensure that we use only the standard $(VAR) notation,
# not @...@ in Makefile.am, now that we can rely on automake
# to emit a definition for each substituted variable.
makefile-check :
grep -nE '@[A-Z_0-9]+@' ` find . -name Makefile.am` \
&& { echo 'Makefile.maint: use $$(...), not @...@' 1>& 2; exit 1; } || :
news-date-check : NEWS
today = ` date +%Y-%m-%d` ; \
if head NEWS | grep '^\*.* $(VERSION_REGEXP) (' $$ today')' \
>/dev/null; then \
:; \
else \
echo "version or today's date is not in NEWS" 1>& 2; \
exit 1; \
fi
changelog-check :
if head ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$' \
>/dev/null; then \
:; \
else \
echo " $( VERSION) not in ChangeLog " 1>& 2; \
exit 1; \
fi
m4-check :
@grep -n 'AC_DEFUN([^[]' m4/*.m4 \
&& { echo 'Makefile.maint: quote the first arg to AC_DEFUN' 1>& 2; \
exit 1; } || :
# Verify that all source files using _() are listed in po/POTFILES.in.
# FIXME: don't hard-code file names below; use a more general mechanism.
po-check :
if test -f po/POTFILES.in; then \
grep -E -v '^(#|$$)' po/POTFILES.in \
| grep -v '^src/false\.c$$' | sort > $@ -1; \
files = ; \
2008-03-24 13:20:15 +03:00
for file in $$ ( $( VC_LIST_EXCEPT) ) ; do \
case $$ file in \
djgpp/* | man/*) continue ; ; \
*/c99-to-c89.diff) continue ; ; \
esac ; \
2008-01-29 20:42:39 +03:00
case $$ file in \
*.[ ch] ) \
base = ` expr " $$ file " : ' \(.*\)\..' ` ; \
{ test -f $$ base.l || test -f $$ base.y; } && continue ; ; \
2008-03-24 13:20:15 +03:00
*) continue ; ; \
2008-01-29 20:42:39 +03:00
esac ; \
files = " $$ files $$ file " ; \
done ; \
grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$ files \
| sort -u > $@ -2; \
diff -u $@ -1 $@ -2 || exit 1; \
rm -f $@ -1 $@ -2; \
fi
# In a definition of #define AUTHORS "... and ..." where the RHS contains
# the English word `and', the string must be marked with `N_ (...)' so that
# gettext recognizes it as a string requiring translation.
author_mark_check :
@grep -n '^# *define AUTHORS "[^"]* and ' src/*.c | grep -v ' N_ (' && \
{ echo 'Makefile.maint: enclose the above strings in N_ (...)' 1>& 2; \
exit 1; } || :
# Sometimes it is useful to change the PATH environment variable
# in Makefiles. When doing so, it's better not to use the Unix-centric
# path separator of `:', but rather the automake-provided `@PATH_SEPARATOR@'.
# It'd be better to use `find -print0 ...|xargs -0 ...', but less portable,
# and there probably aren't many projects with so many Makefile.am files
# that we'd have to worry about limits on command line length.
msg = 'Makefile.maint: Do not use `:' \' ' above; use @PATH_SEPARATOR@ instead'
makefile_path_separator_check :
@grep -n 'PATH=.*:' ` find $( srcdir) -name Makefile.am` \
&& { echo $( msg) 1>& 2; exit 1; } || :
# Check that `make alpha' will not fail at the end of the process.
writable-files :
if test -d $( release_archive_dir) ; then :; else \
2008-03-24 13:20:15 +03:00
for file in $( distdir) .tar.gz \
$( release_archive_dir) /$( distdir) .tar.gz; do \
test -e $$ file || continue ; \
test -w $$ file \
|| { echo ERROR: $$ file is not writable; fail = 1; } ; \
done ; \
test " $$ fail " && exit 1 || :
2008-01-29 20:42:39 +03:00
fi
v_etc_file = lib/version-etc.c
sample-test = tests/sample-test
texi = doc/$( PACKAGE) .texi
# Make sure that the copyright date in $(v_etc_file) is up to date.
# Do the same for the $(sample-test) and the main doc/.texi file.
copyright-check :
@if test -f $( v_etc_file) ; then \
grep 'enum { COPYRIGHT_YEAR = ' $$ ( date +%Y) ' };' $( v_etc_file) \
>/dev/null \
|| { echo 'out of date copyright in $(v_etc_file); update it' 1>& 2; \
exit 1; } ; \
fi
@if test -f $( sample-test) ; then \
grep '# Copyright (C) ' $$ ( date +%Y) ' Free' $( sample-test) \
>/dev/null \
|| { echo 'out of date copyright in $(sample-test); update it' 1>& 2; \
exit 1; } ; \
fi
@if test -f $( texi) ; then \
grep 'Copyright @copyright{} .*' $$ ( date +%Y) ' Free' $( texi) \
>/dev/null \
|| { echo 'out of date copyright in $(texi); update it' 1>& 2; \
exit 1; } ; \
fi
vc-diff-check :
$( VC) diff > vc-diffs || :
if test -s vc-diffs; then \
cat vc-diffs; \
echo "Some files are locally modified:" 1>& 2; \
exit 1; \
else \
rm vc-diffs; \
fi
cvs-check : vc -diff -check
maintainer-distcheck :
$( MAKE) distcheck
$( MAKE) my-distcheck
# Use -Wformat -Werror to detect format-string/arg-list mismatches.
# Also, check for shadowing problems with -Wshadow, and for pointer
# arithmetic problems with -Wpointer-arith.
# These CFLAGS are pretty strict. If you build this target, you probably
# have to have a recent version of gcc and glibc headers.
# The for-loop below ensures that there is a bin/ directory full of all
# of the programs under test (except the few that are required for basic
# Makefile rules), all symlinked to the just-built "false" program.
# This is to ensure that if ever a test neglects to make PATH include
# the build srcdir, these always-failing programs will run.
# Otherwise, it is too easy to test the wrong programs.
# Note that "false" itself is a symlink to true, so it too will malfunction.
TMPDIR ?= /tmp
t = $( TMPDIR) /$( PACKAGE) /test
my-distcheck : $( local -check ) check
-rm -rf $( t)
mkdir -p $( t)
GZIP = $( GZIP_ENV) $( AMTAR) -C $( t) -zxf $( distdir) .tar.gz
cd $( t) /$( distdir) \
&& ./configure --disable-nls \
&& $( MAKE) CFLAGS = '$(warn_cflags)' \
AM_MAKEFLAGS = '$(null_AM_MAKEFLAGS)' \
&& $( MAKE) dvi \
&& $( MAKE) distclean
( cd $( t) && mv $( distdir) $( distdir) .old \
&& $( AMTAR) -zxf - ) < $( distdir) .tar.gz
diff -ur $( t) /$( distdir) .old $( t) /$( distdir)
if test -f $( srcdir) /src/c99-to-c89.diff; then \
cd $( t) /$( distdir) \
&& ( cd src && patch -V never --fuzz= 0 <c99-to-c89.diff) \
&& ./configure --disable-largefile \
CFLAGS = '-Werror -ansi -Wno-long-long' \
&& $( MAKE) ; \
fi
-rm -rf $( t)
@echo "========================" ; \
echo " $( distdir) .tar.gz is ready for distribution " ; \
echo "========================"