Apply __attribute__((deprecated)) to archive_read_open_file,

archive_write_open_file, archive_position_compressed,
archive_position_uncompressed, archive_compression_name and
archive_compression.

diff --git a/libarchive/archive.h b/libarchive/archive.h
index b4da85ef9c99d1be954ccd4ec4e402a47858e9bb..d31de44fbbebd6d1e81b5c48d6a0c173ceec32c8 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -97,6 +97,12 @@
 #define        __LA_PRINTF(fmtarg, firstvararg)        /* nothing */
 #endif
 
+#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
+# define __LA_DEPRECATED __attribute__((deprecated))
+#else
+# define __LA_DEPRECATED
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -423,7 +429,7 @@ __LA_DECL int archive_read_open_filename_w(struct archive *,
                     const wchar_t *_filename, size_t _block_size);
 /* archive_read_open_file() is a deprecated synonym for ..._open_filename(). */
 __LA_DECL int archive_read_open_file(struct archive *,
-                    const char *_filename, size_t _block_size);
+                    const char *_filename, size_t _block_size) __LA_DEPRECATED;
 /* Read an archive that's stored in memory. */
 __LA_DECL int archive_read_open_memory(struct archive *,
                     void * buff, size_t size);
@@ -656,7 +662,8 @@ __LA_DECL int archive_write_open_filename(struct archive *, const char *_file);
 __LA_DECL int archive_write_open_filename_w(struct archive *,
                     const wchar_t *_file);
 /* A deprecated synonym for archive_write_open_filename() */
-__LA_DECL int archive_write_open_file(struct archive *, const char *_file);
+__LA_DECL int archive_write_open_file(struct archive *, const char *_file)
+               __LA_DEPRECATED;
 __LA_DECL int archive_write_open_FILE(struct archive *, FILE *);
 /* _buffSize is the size of the buffer, _used refers to a variable that
  * will be updated after each write into the buffer. */
@@ -866,13 +873,17 @@ __LA_DECL const char *     archive_filter_name(struct archive *, int);
 /* These don't properly handle multiple filters, so are deprecated and
  * will eventually be removed. */
 /* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, -1); */
-__LA_DECL __LA_INT64_T  archive_position_compressed(struct archive *);
+__LA_DECL __LA_INT64_T  archive_position_compressed(struct archive *)
+                               __LA_DEPRECATED;
 /* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, 0); */
-__LA_DECL __LA_INT64_T  archive_position_uncompressed(struct archive *);
+__LA_DECL __LA_INT64_T  archive_position_uncompressed(struct archive *)
+                               __LA_DEPRECATED;
 /* As of libarchive 3.0, this is an alias for archive_filter_name(a, 0); */
-__LA_DECL const char   *archive_compression_name(struct archive *);
+__LA_DECL const char   *archive_compression_name(struct archive *)
+                               __LA_DEPRECATED;
 /* As of libarchive 3.0, this is an alias for archive_filter_code(a, 0); */
-__LA_DECL int           archive_compression(struct archive *);
+__LA_DECL int           archive_compression(struct archive *)
+                               __LA_DEPRECATED;
 #endif
 
 __LA_DECL int           archive_errno(struct archive *);