gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2007-01-21 [colin] 2.7.1cvs48

Browse source 
* src/ldapquery.c
	* src/ldapquery.h
		Same
This commit is contained in:
Colin Leroy 2007-01-21 20:28:12 +00:00
parent 042e4240cc
commit 97bbb62b14
5 changed files with 15 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-01-21 [colin] 2.7.1cvs48
* src/ldapquery.c
* src/ldapquery.h
Same
2007-01-21 [colin] 2.7.1cvs47
* src/procmsg.c

1
PATCHSETS
View file

@ -2305,3 +2305,4 @@
( cvs diff -u -r 1.23.2.20 -r 1.23.2.21 src/crash.c; cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/exporthtml.c; cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/exporthtml.h; cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/exportldif.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/exportldif.h; cvs diff -u -r 1.213.2.132 -r 1.213.2.133 src/folder.c; cvs diff -u -r 1.87.2.36 -r 1.87.2.37 src/folder.h; cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/folder_item_prefs.c; cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/folder_item_prefs.h; cvs diff -u -r 1.207.2.145 -r 1.207.2.146 src/folderview.c; cvs diff -u -r 1.20.2.17 -r 1.20.2.18 src/folderview.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gedit-print.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gedit-print.h; cvs diff -u -r 1.115.2.129 -r 1.115.2.130 src/main.c; cvs diff -u -r 1.7.2.8 -r 1.7.2.9 src/main.h; cvs diff -u -r 1.13.2.25 -r 1.13.2.26 src/common/socket.c; cvs diff -u -r 1.13.2.10 -r 1.13.2.11 src/common/socket.h; cvs diff -u -r 1.9.2.49 -r 1.9.2.50 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/gtkaspell.h; cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/quicksearch.h; ) > 2.7.1cvs45.patchset
( cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/common/socket.c; cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/common/socket.h; ) > 2.7.1cvs46.patchset
( cvs diff -u -r 1.150.2.88 -r 1.150.2.89 src/procmsg.c; cvs diff -u -r 1.60.2.38 -r 1.60.2.39 src/procmsg.h; ) > 2.7.1cvs47.patchset
( cvs diff -u -r 1.3.2.13 -r 1.3.2.14 src/ldapquery.c; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/ldapquery.h; ) > 2.7.1cvs48.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=7
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=47
EXTRA_VERSION=48
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

91
src/ldapquery.c
View file

@ -127,15 +127,6 @@ void ldapqry_set_search_value( LdapQuery *qry, const gchar *value ) {
g_strstrip( ADDRQUERY_SEARCHVALUE(qry) );
}
/**
* Specify error/status.
* \param qry Query object.
* \param value Status.
*/
void ldapqry_set_error_status( LdapQuery* qry, const gint value ) {
ADDRQUERY_RETVAL(qry) = value;
}
/**
* Specify query type.
* \param qry Query object.
@ -171,20 +162,6 @@ void ldapqry_set_query_id( LdapQuery* qry, const gint value ) {
ADDRQUERY_ID(qry) = value;
}
/**
* Specify maximum number of LDAP entries to retrieve.
* \param qry Query object.
* \param value Entries to read.
*/
void ldapqry_set_entries_read( LdapQuery* qry, const gint value ) {
if( value > 0 ) {
qry->entriesRead = value;
}
else {
qry->entriesRead = 0;
}
}
/**
* Register a callback function that will be executed when each entry
* has been read and processed. When called, the function will be passed
@ -237,7 +214,7 @@ void ldapqry_set_callback_end( LdapQuery *qry, void *func ) {
* \param qry Query object.
* \param value Value of stop flag.
*/
void ldapqry_set_stop_flag( LdapQuery *qry, const gboolean value ) {
static void ldapqry_set_stop_flag( LdapQuery *qry, const gboolean value ) {
g_return_if_fail( qry != NULL );
pthread_mutex_lock( qry->mutexStop );
@ -251,7 +228,7 @@ void ldapqry_set_stop_flag( LdapQuery *qry, const gboolean value ) {
* \param qry Query object.
* \return Value of stop flag.
*/
gboolean ldapqry_get_stop_flag( LdapQuery *qry ) {
static gboolean ldapqry_get_stop_flag( LdapQuery *qry ) {
gboolean value;
g_return_val_if_fail( qry != NULL, TRUE );
@ -266,7 +243,7 @@ gboolean ldapqry_get_stop_flag( LdapQuery *qry ) {
* \param qry Query object.
* \param value Value of busy flag.
*/
void ldapqry_set_busy_flag( LdapQuery *qry, const gboolean value ) {
static void ldapqry_set_busy_flag( LdapQuery *qry, const gboolean value ) {
g_return_if_fail( qry != NULL );
pthread_mutex_lock( qry->mutexBusy );
@ -280,7 +257,7 @@ void ldapqry_set_busy_flag( LdapQuery *qry, const gboolean value ) {
* \param qry Query object.
* \return Value of busy flag.
*/
gboolean ldapqry_get_busy_flag( LdapQuery *qry ) {
static gboolean ldapqry_get_busy_flag( LdapQuery *qry ) {
gboolean value;
g_return_val_if_fail( qry != NULL, FALSE );
@ -295,46 +272,16 @@ gboolean ldapqry_get_busy_flag( LdapQuery *qry ) {
* \param qry Query object.
* \param value Value of aged flag.
*/
void ldapqry_set_aged_flag( LdapQuery *qry, const gboolean value ) {
static void ldapqry_set_aged_flag( LdapQuery *qry, const gboolean value ) {
g_return_if_fail( qry != NULL );
qry->agedFlag = value;
}
/**
* Test value of aged flag.
* \param qry Query object.
* \return <i>TRUE</i> if query has been marked as aged (and can be retired).
*/
gboolean ldapqry_get_aged_flag( LdapQuery *qry ) {
g_return_val_if_fail( qry != NULL, TRUE );
return qry->agedFlag;
}
/**
* Specify user data for query.
* \param qry Query object.
* \param value Data to set.
*/
void ldapqry_set_data( LdapQuery *qry, const gpointer value ) {
g_return_if_fail( qry != NULL );
qry->data = value;
}
/**
* Retrieve user data associated with query.
* \param qry Query object.
* \return Data.
*/
gpointer ldapqry_get_data( LdapQuery *qry ) {
g_return_val_if_fail( qry != NULL, NULL );
return qry->data;
}
/**
* Clear LDAP query member variables.
* \param qry Query object.
*/
void ldapqry_clear( LdapQuery *qry ) {
static void ldapqry_clear( LdapQuery *qry ) {
g_return_if_fail( qry != NULL );
/* Free internal stuff */
@ -395,30 +342,6 @@ void ldapqry_free( LdapQuery *qry ) {
g_free( qry );
}
/**
* Display object to specified stream.
* \param qry Query object to process.
* \param stream Output stream.
*/
void ldapqry_print( const LdapQuery *qry, FILE *stream ) {
g_return_if_fail( qry != NULL );
fprintf( stream, "LdapQuery:\n" );
fprintf( stream, " control?: %s\n", qry->control ? "yes" : "no" );
fprintf( stream, "err/status: %d\n", ADDRQUERY_RETVAL(qry) );
fprintf( stream, "query type: %d\n", ADDRQUERY_TYPE(qry) );
fprintf( stream, "searchType: %d\n", ADDRQUERY_SEARCHTYPE(qry) );
fprintf( stream, "query name: '%s'\n", ADDRQUERY_NAME(qry) );
fprintf( stream, "search val: '%s'\n", ADDRQUERY_SEARCHVALUE(qry) );
fprintf( stream, " queryID: %d\n", ADDRQUERY_ID(qry) );
fprintf( stream, " entries: %d\n", qry->entriesRead );
fprintf( stream, " elapsed: %d\n", qry->elapsedTime );
fprintf( stream, " stop flag: %s\n", qry->stopFlag ? "yes" : "no" );
fprintf( stream, " busy flag: %s\n", qry->busyFlag ? "yes" : "no" );
fprintf( stream, " aged flag: %s\n", qry->agedFlag ? "yes" : "no" );
fprintf( stream, " completed: %s\n", qry->completed ? "yes" : "no" );
}
/**
* Free linked lists of character strings.
* \param listName List of common names.
@ -953,7 +876,7 @@ static gint ldapqry_perform_locate( LdapQuery *qry );
* \param qry Query object to process.
* \return Error/status code.
*/
gint ldapqry_search( LdapQuery *qry ) {
static gint ldapqry_search( LdapQuery *qry ) {
gint retVal;
g_return_val_if_fail( qry != NULL, -1 );

13
src/ldapquery.h
View file

@ -73,28 +73,15 @@ LdapQuery *ldapqry_create ( void );
void ldapqry_set_control ( LdapQuery *qry, LdapControl *ctl );
void ldapqry_set_name ( LdapQuery* qry, const gchar *value );
void ldapqry_set_search_value ( LdapQuery *qry, const gchar *value );
void ldapqry_set_error_status ( LdapQuery* qry, const gint value );
void ldapqry_set_search_type ( LdapQuery *qry, const AddrSearchType value );
void ldapqry_set_query_id ( LdapQuery* qry, const gint value );
void ldapqry_set_entries_read ( LdapQuery* qry, const gint value );
void ldapqry_set_callback_start ( LdapQuery *qry, void *func );
void ldapqry_set_callback_entry ( LdapQuery *qry, void *func );
void ldapqry_set_callback_end ( LdapQuery *qry, void *func );
void ldapqry_clear ( LdapQuery *qry );
void ldapqry_free ( LdapQuery *qry );
void ldapqry_print ( const LdapQuery *qry, FILE *stream );
void ldapqry_set_stop_flag ( LdapQuery *qry, const gboolean value );
gboolean ldapqry_get_stop_flag ( LdapQuery *qry );
void ldapqry_set_busy_flag ( LdapQuery *qry, const gboolean value );
gboolean ldapqry_get_busy_flag ( LdapQuery *qry );
void ldapqry_set_aged_flag ( LdapQuery *qry, const gboolean value );
gboolean ldapqry_get_aged_flag ( LdapQuery *qry );
void ldapqry_set_data ( LdapQuery *qry, const gpointer value );
gpointer ldapqry_get_data ( LdapQuery *qry );
gboolean ldapqry_check_search ( LdapQuery *qry );
void ldapqry_touch ( LdapQuery *qry );
gint ldapqry_search ( LdapQuery *qry );
gint ldapqry_read_data_th ( LdapQuery *qry );
void ldapqry_cancel ( LdapQuery *qry );
void ldapqry_age ( LdapQuery *qry, gint maxAge );