RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/ CHANGES rpm/lib/ rpm4compat.h

From: Jeff Johnson <n3npq@mac.com>
Date: Sat 06 Dec 2008 - 18:11:47 CET
Message-id: <8C5DC6A0-2179-45F9-A779-681F71488207@mac.com>
Instead of __attribute__((unused)), you might consider validating
the unused arguments, and returning an error if the (unused) args
are incorrectly specified.

Not that it matters ...

73 de Jeff

On Dec 6, 2008, at 8:57 AM, Per ōyvind Karlsen wrote:

>  RPM Package Manager, CVS Repository
>  http://rpm5.org/cvs/
>   
> ____________________________________________________________________________
>
>  Server: rpm5.org                         Name:   Per ōyvind Karlsen
>  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
>  Module: rpm                              Date:   06-Dec-2008 14:57:12
>  Branch: HEAD                             Handle: 2008120613571100
>
>  Modified files:
>    rpm                     CHANGES
>    rpm/lib                 rpm4compat.h
>
>  Log:
>    rpm4compat: disable warnings about unused variables.
>
>  Summary:
>    Revision    Changes     Path
>    1.2667      +1  -0      rpm/CHANGES
>    2.23        +5  -7      rpm/lib/rpm4compat.h
>   
> ____________________________________________________________________________
>
>  patch -p0 <<'@@ .'
>  Index: rpm/CHANGES
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r1.2666 -r1.2667 CHANGES
>  --- rpm/CHANGES	5 Dec 2008 07:07:43 -0000	1.2666
>  +++ rpm/CHANGES	6 Dec 2008 13:57:11 -0000	1.2667
>  @@ -1,5 +1,6 @@
>
>   5.2a2 -> 5.2a3:
>  +    - proyvind: rpm4compat: disable warnings about unused variables.
>       - proyvind: Mandriva: Always treat file conflicts during  
> install (rpm -i)
>   	 as errors. (dont-filter-install-file-conflicts)
>       - proyvind: perl: clean out some mess.
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/lib/rpm4compat.h
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.22 -r2.23 rpm4compat.h
>  --- rpm/lib/rpm4compat.h	9 Oct 2008 20:40:01 -0000	2.22
>  +++ rpm/lib/rpm4compat.h	6 Dec 2008 13:57:11 -0000	2.23
>  @@ -1,7 +1,7 @@
>   /*
>    * Copyright ¬© 2008 Per √ėyvind Karlsen <peroyvind@mandriva.org>
>    *
>  - * $Id: rpm4compat.h,v 2.22 2008/10/09 20:40:01 pkarlsen Exp $
>  + * $Id: rpm4compat.h,v 2.23 2008/12/06 13:57:11 pkarlsen Exp $
>    */
>
>   #ifndef	H_RPM4COMPAT
>  @@ -290,16 +290,15 @@
>   	return headerInit(h);
>   }
>
>  -static inline void * headerFreeData(const void * data, rpmTagType  
> type) {
>  +static inline void * headerFreeData(const void * data,  
> __attribute__((unused)) rpmTagType type) {
>   	if (data)
>   		free((void *)data);
>   	return NULL;
>   }
>
>  -static inline int headerWrite(void * _fd, Header h, enum hMagic  
> magicp) {
>  +static inline int headerWrite(void * _fd, Header h,  
> __attribute__((unused)) enum hMagic magicp) {
>   	const char item[] = "Header";
>   	const char * msg = NULL;
>  -	(void) magicp;
>   	rpmRC rc = rpmpkgWrite(item, (FD_t)_fd, h, &msg);
>   	if (rc != RPMRC_OK) {
>   		rpmlog(RPMLOG_ERR, "%s: %s: %s\n", "headerWrite", item, msg);
>  @@ -309,11 +308,10 @@
>   	return rc;
>   }
>
>  -static inline Header headerRead(void * _fd, enum hMagic magicp) {
>  +static inline Header headerRead(void * _fd,  
> __attribute__((unused)) enum hMagic magicp) {
>   	const char item[] = "Header";
>   	Header h = NULL;
>   	const char * msg = NULL;
>  -	(void) magicp;
>   	rpmRC rc = rpmpkgRead(item, (FD_t)_fd, &h, &msg);
>   	switch (rc) {
>   		default:
>  @@ -327,7 +325,7 @@
>   	return h;
>   }
>
>  -static inline int rpmMachineScore(int type, const char * name) {
>  +static inline int rpmMachineScore(__attribute__((unused)) int  
> type, const char * name) {
>   	char * platform = rpmExpand(name, "-%{_target_vendor}-% 
> {_target_os}%{?_gnu}", NULL);
>   	int score = rpmPlatformScore(platform, NULL, 0);
>
>  @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org



  • application/pkcs7-signature attachment: smime.p7s
Received on Sat Dec 6 18:12:15 2008
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.