[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2157: change some argz parameter names - no behavioral change

[Mats Wichmann]

------------------------------------------------------------
revno: 2157
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2013-09-20 05:44:53 -0600
message:
  change some argz parameter names - no behavioral change
modified:
  headers/All/5.0/argz.h.defs
  headers/argz.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/argz.h.defs'
--- a/headers/All/5.0/argz.h.defs	2013-02-21 04:33:45 +0000
+++ b/headers/All/5.0/argz.h.defs	2013-09-20 11:44:53 +0000
@@ -2,15 +2,16 @@
 typedef int error_t;
 extern error_t argz_add(char **argz, size_t * argz_len, const char *str);
 extern error_t argz_add_sep(char **argz, size_t * argz_len,
-			    const char *str, int delim);
+			    const char *str, int sep);
 extern error_t argz_append(char **argz, size_t * argz_len, const char *buf,
 			   size_t buf_len);
-extern size_t argz_count(const char *argz, size_t * len);
-extern error_t argz_create(char *const argv[], char **argz, size_t * len);
+extern size_t argz_count(const char *argz, size_t * argz_len);
+extern error_t argz_create(char *const argv[], char **argz,
+			   size_t * argz_len);
 extern error_t argz_create_sep(const char *str, int sep, char **argz,
-			       size_t * len);
+			       size_t * argz_len);
 extern void argz_delete(char **argz, size_t * argz_len, char *entry);
-extern void argz_extract(const char *argz, size_t len, char **argv);
+extern void argz_extract(const char *argz, size_t argz_len, char **argv);
 extern error_t argz_insert(char **argz_insert, size_t * argz_len,
 			   char *before, const char *entry);
 extern char argz_next(const char *argz, size_t argz_len,
@@ -18,4 +19,4 @@
 extern error_t argz_replace(char **argz, size_t * argz_len,
 			    const char *str, const char *with,
 			    unsigned int *replace_count);
-extern void argz_stringify(char *argz, size_t len, int sep);
+extern void argz_stringify(char *argz, size_t argz_len, int sep);

=== modified file 'headers/argz.h'
--- a/headers/argz.h	2013-02-21 04:33:45 +0000
+++ b/headers/argz.h	2013-09-20 11:44:53 +0000
@@ -17,16 +17,17 @@
     extern error_t argz_add(char **argz, size_t * argz_len,
 			    const char *str);
     extern error_t argz_add_sep(char **argz, size_t * argz_len,
-				const char *str, int delim);
+				const char *str, int sep);
     extern error_t argz_append(char **argz, size_t * argz_len,
 			       const char *buf, size_t buf_len);
-    extern size_t argz_count(const char *argz, size_t * len);
+    extern size_t argz_count(const char *argz, size_t * argz_len);
     extern error_t argz_create(char *const argv[], char **argz,
-			       size_t * len);
+			       size_t * argz_len);
     extern error_t argz_create_sep(const char *str, int sep, char **argz,
-				   size_t * len);
+				   size_t * argz_len);
     extern void argz_delete(char **argz, size_t * argz_len, char *entry);
-    extern void argz_extract(const char *argz, size_t len, char **argv);
+    extern void argz_extract(const char *argz, size_t argz_len,
+			     char **argv);
     extern error_t argz_insert(char **argz_insert, size_t * argz_len,
 			       char *before, const char *entry);
     extern char argz_next(const char *argz, size_t argz_len,
@@ -34,7 +35,7 @@
     extern error_t argz_replace(char **argz, size_t * argz_len,
 				const char *str, const char *with,
 				unsigned int *replace_count);
-    extern void argz_stringify(char *argz, size_t len, int sep);
+    extern void argz_stringify(char *argz, size_t argz_len, int sep);
 #ifdef __cplusplus
 }
 #endif

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-09-13 18:05:07 +0000
+++ b/package/Makefile	2013-09-20 11:44:53 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=3
+RPM_PACKAGE_RELEASE=4
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)