[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2708-gfd18b01
Derrell Lipman
derrell.lipman at unwireduniverse.com
Tue Mar 4 03:57:20 GMT 2008
The branch, v3-2-test has been updated
via fd18b01016d1dc4b08983975353e62084fdc323c (commit)
from 8927b50d6051fcefd87f19dc90c5826378d03e4e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit fd18b01016d1dc4b08983975353e62084fdc323c
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Mon Mar 3 22:56:32 2008 -0500
use constant name less likely to cause conflict
-----------------------------------------------------------------------
Summary of changes:
source/include/libsmbclient.h | 100 ++++++++++++++++++++--------------------
1 files changed, 50 insertions(+), 50 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/libsmbclient.h b/source/include/libsmbclient.h
index e1a4b74..2e38944 100644
--- a/source/include/libsmbclient.h
+++ b/source/include/libsmbclient.h
@@ -25,11 +25,11 @@
#ifndef SMBCLIENT_H_INCLUDED
#define SMBCLIENT_H_INCLUDED
-#undef _DEPRECATED_
+#undef DEPRECATED_SMBC_INTERFACE
#if ! defined(__LIBSMBCLIENT_INTERNAL__) && defined(__GNUC__)
-# define _DEPRECATED_ __attribute__ ((deprecated))
+# define DEPRECATED_SMBC_INTERFACE __attribute__ ((deprecated))
#else
-# define _DEPRECATED_
+# define DEPRECATED_SMBC_INTERFACE
#endif
#ifdef __cplusplus
@@ -2600,7 +2600,7 @@ struct _SMBCCTX
* DEPRECATED:
* Use smbc_getDebug() and smbc_setDebug()
*/
- int debug _DEPRECATED_;
+ int debug DEPRECATED_SMBC_INTERFACE;
/**
* netbios name used for making connections
@@ -2608,7 +2608,7 @@ struct _SMBCCTX
* DEPRECATED:
* Use smbc_getNetbiosName() and smbc_setNetbiosName()
*/
- char * netbios_name _DEPRECATED_;
+ char * netbios_name DEPRECATED_SMBC_INTERFACE;
/**
* workgroup name used for making connections
@@ -2616,7 +2616,7 @@ struct _SMBCCTX
* DEPRECATED:
* Use smbc_getWorkgroup() and smbc_setWorkgroup()
*/
- char * workgroup _DEPRECATED_;
+ char * workgroup DEPRECATED_SMBC_INTERFACE;
/**
* username used for making connections
@@ -2624,7 +2624,7 @@ struct _SMBCCTX
* DEPRECATED:
* Use smbc_getUser() and smbc_setUser()
*/
- char * user _DEPRECATED_;
+ char * user DEPRECATED_SMBC_INTERFACE;
/**
* timeout used for waiting on connections / response data (in
@@ -2633,7 +2633,7 @@ struct _SMBCCTX
* DEPRECATED:
* Use smbc_getTimeout() and smbc_setTimeout()
*/
- int timeout _DEPRECATED_;
+ int timeout DEPRECATED_SMBC_INTERFACE;
/**
* callable functions for files:
@@ -2644,40 +2644,40 @@ struct _SMBCCTX
* Use smbc_getFunction*() and smbc_setFunction*(), e.g.
* smbc_getFunctionOpen(), smbc_setFunctionUnlink(), etc.
*/
- smbc_open_fn open _DEPRECATED_;
- smbc_creat_fn creat _DEPRECATED_;
- smbc_read_fn read _DEPRECATED_;
- smbc_write_fn write _DEPRECATED_;
- smbc_unlink_fn unlink _DEPRECATED_;
- smbc_rename_fn rename _DEPRECATED_;
- smbc_lseek_fn lseek _DEPRECATED_;
- smbc_stat_fn stat _DEPRECATED_;
- smbc_fstat_fn fstat _DEPRECATED_;
+ smbc_open_fn open DEPRECATED_SMBC_INTERFACE;
+ smbc_creat_fn creat DEPRECATED_SMBC_INTERFACE;
+ smbc_read_fn read DEPRECATED_SMBC_INTERFACE;
+ smbc_write_fn write DEPRECATED_SMBC_INTERFACE;
+ smbc_unlink_fn unlink DEPRECATED_SMBC_INTERFACE;
+ smbc_rename_fn rename DEPRECATED_SMBC_INTERFACE;
+ smbc_lseek_fn lseek DEPRECATED_SMBC_INTERFACE;
+ smbc_stat_fn stat DEPRECATED_SMBC_INTERFACE;
+ smbc_fstat_fn fstat DEPRECATED_SMBC_INTERFACE;
#if 0 /* internal */
smbc_ftruncate_fn ftruncate_fn;
#endif
- smbc_close_fn close_fn _DEPRECATED_;
- smbc_opendir_fn opendir _DEPRECATED_;
- smbc_closedir_fn closedir _DEPRECATED_;
- smbc_readdir_fn readdir _DEPRECATED_;
- smbc_getdents_fn getdents _DEPRECATED_;
- smbc_mkdir_fn mkdir _DEPRECATED_;
- smbc_rmdir_fn rmdir _DEPRECATED_;
- smbc_telldir_fn telldir _DEPRECATED_;
- smbc_lseekdir_fn lseekdir _DEPRECATED_;
- smbc_fstatdir_fn fstatdir _DEPRECATED_;
- smbc_chmod_fn chmod _DEPRECATED_;
- smbc_utimes_fn utimes _DEPRECATED_;
- smbc_setxattr_fn setxattr _DEPRECATED_;
- smbc_getxattr_fn getxattr _DEPRECATED_;
- smbc_removexattr_fn removexattr _DEPRECATED_;
- smbc_listxattr_fn listxattr _DEPRECATED_;
+ smbc_close_fn close_fn DEPRECATED_SMBC_INTERFACE;
+ smbc_opendir_fn opendir DEPRECATED_SMBC_INTERFACE;
+ smbc_closedir_fn closedir DEPRECATED_SMBC_INTERFACE;
+ smbc_readdir_fn readdir DEPRECATED_SMBC_INTERFACE;
+ smbc_getdents_fn getdents DEPRECATED_SMBC_INTERFACE;
+ smbc_mkdir_fn mkdir DEPRECATED_SMBC_INTERFACE;
+ smbc_rmdir_fn rmdir DEPRECATED_SMBC_INTERFACE;
+ smbc_telldir_fn telldir DEPRECATED_SMBC_INTERFACE;
+ smbc_lseekdir_fn lseekdir DEPRECATED_SMBC_INTERFACE;
+ smbc_fstatdir_fn fstatdir DEPRECATED_SMBC_INTERFACE;
+ smbc_chmod_fn chmod DEPRECATED_SMBC_INTERFACE;
+ smbc_utimes_fn utimes DEPRECATED_SMBC_INTERFACE;
+ smbc_setxattr_fn setxattr DEPRECATED_SMBC_INTERFACE;
+ smbc_getxattr_fn getxattr DEPRECATED_SMBC_INTERFACE;
+ smbc_removexattr_fn removexattr DEPRECATED_SMBC_INTERFACE;
+ smbc_listxattr_fn listxattr DEPRECATED_SMBC_INTERFACE;
/* Printing-related functions */
- smbc_print_file_fn print_file _DEPRECATED_;
- smbc_open_print_job_fn open_print_job _DEPRECATED_;
- smbc_list_print_jobs_fn list_print_jobs _DEPRECATED_;
- smbc_unlink_print_job_fn unlink_print_job _DEPRECATED_;
+ smbc_print_file_fn print_file DEPRECATED_SMBC_INTERFACE;
+ smbc_open_print_job_fn open_print_job DEPRECATED_SMBC_INTERFACE;
+ smbc_list_print_jobs_fn list_print_jobs DEPRECATED_SMBC_INTERFACE;
+ smbc_unlink_print_job_fn unlink_print_job DEPRECATED_SMBC_INTERFACE;
/*
** Callbacks
@@ -2695,7 +2695,7 @@ struct _SMBCCTX
* DEPRECATED:
* Use smbc_getFunctionAuthData(), smbc_setFunctionAuthData()
*/
- smbc_get_auth_data_fn auth_fn _DEPRECATED_;
+ smbc_get_auth_data_fn auth_fn DEPRECATED_SMBC_INTERFACE;
/**
* check if a server is still good
@@ -2704,7 +2704,7 @@ struct _SMBCCTX
* Use smbc_getFunctionCheckServer(),
* smbc_setFunctionCheckServer()
*/
- smbc_check_server_fn check_server_fn _DEPRECATED_;
+ smbc_check_server_fn check_server_fn DEPRECATED_SMBC_INTERFACE;
/**
* remove a server if unused
@@ -2713,7 +2713,7 @@ struct _SMBCCTX
* Use smbc_getFunctionRemoveUnusedServer(),
* smbc_setFunctionCheckServer()
*/
- smbc_remove_unused_server_fn remove_unused_server_fn _DEPRECATED_;
+ smbc_remove_unused_server_fn remove_unused_server_fn DEPRECATED_SMBC_INTERFACE;
/** Cache subsystem
*
@@ -2730,7 +2730,7 @@ struct _SMBCCTX
* Use smbc_getFunctionAddCachedServer(),
* smbc_setFunctionAddCachedServer()
*/
- smbc_add_cached_srv_fn add_cached_srv_fn _DEPRECATED_;
+ smbc_add_cached_srv_fn add_cached_srv_fn DEPRECATED_SMBC_INTERFACE;
/**
* server cache lookup
@@ -2739,7 +2739,7 @@ struct _SMBCCTX
* Use smbc_getFunctionGetCachedServer(),
* smbc_setFunctionGetCachedServer()
*/
- smbc_get_cached_srv_fn get_cached_srv_fn _DEPRECATED_;
+ smbc_get_cached_srv_fn get_cached_srv_fn DEPRECATED_SMBC_INTERFACE;
/**
* server cache removal
@@ -2748,7 +2748,7 @@ struct _SMBCCTX
* Use smbc_getFunctionRemoveCachedServer(),
* smbc_setFunctionRemoveCachedServer()
*/
- smbc_remove_cached_srv_fn remove_cached_srv_fn _DEPRECATED_;
+ smbc_remove_cached_srv_fn remove_cached_srv_fn DEPRECATED_SMBC_INTERFACE;
/**
* server cache purging, try to remove all cached servers
@@ -2758,7 +2758,7 @@ struct _SMBCCTX
* Use smbc_getFunctionPurgeCachedServers(),
* smbc_setFunctionPurgeCachedServers()
*/
- smbc_purge_cached_fn purge_cached_fn _DEPRECATED_;
+ smbc_purge_cached_fn purge_cached_fn DEPRECATED_SMBC_INTERFACE;
} callbacks;
/**
@@ -2767,7 +2767,7 @@ struct _SMBCCTX
* DEPRECATED:
* Use smbc_getServerCacheData(), smbc_setServerCacheData()
*/
- void * reserved _DEPRECATED_;
+ void * reserved DEPRECATED_SMBC_INTERFACE;
/*
* Very old configuration options.
@@ -2781,7 +2781,7 @@ struct _SMBCCTX
* smbc_setOptionNoAutoAnonymousLogin()
* smbc_getOptionNoAutoAnonymousLogin()
*/
- int flags _DEPRECATED_;
+ int flags DEPRECATED_SMBC_INTERFACE;
/**
* user options selections that apply to this session
@@ -2793,10 +2793,10 @@ struct _SMBCCTX
* smbc_getOption*() functions.
*/
struct _smbc_options {
- int browse_max_lmb_count _DEPRECATED_;
- int urlencode_readdir_entries _DEPRECATED_;
- int one_share_per_server _DEPRECATED_;
- } options _DEPRECATED_;
+ int browse_max_lmb_count DEPRECATED_SMBC_INTERFACE;
+ int urlencode_readdir_entries DEPRECATED_SMBC_INTERFACE;
+ int one_share_per_server DEPRECATED_SMBC_INTERFACE;
+ } options DEPRECATED_SMBC_INTERFACE;
/** INTERNAL DATA
* do _NOT_ touch this from your program !
--
Samba Shared Repository
More information about the samba-cvs
mailing list