r= mscott
OS/2 bring up continues - PR_CALLBACKs for VisualAge
This commit is contained in:
mkaply%us.ibm.com 2000-05-02 23:11:58 +00:00
Родитель 0d85251d42
Коммит 62f37ade05
14 изменённых файлов: 113 добавлений и 34 удалений

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#include "nscore.h"
@ -97,11 +103,11 @@ private:
void *closure);
// called by EnumerateRemove to release all elements
static PRBool hashElementRelease(nsHashKey *aKey, void *aData,
static PRBool PR_CALLBACK hashElementRelease(nsHashKey *aKey, void *aData,
void *closure);
// Send unload server notification.
static PRBool hashUnloadServer(nsHashKey *aKey, void *aData,
static PRBool PR_CALLBACK hashUnloadServer(nsHashKey *aKey, void *aData,
void *closure);
//
@ -142,8 +148,8 @@ private:
static PRBool findServer(nsISupports *aElement, void *data);
// write out the server's cache through the given folder cache
static PRBool writeFolderCache(nsHashKey *aKey, void *aData, void *closure);
static PRBool closeCachedConnections(nsHashKey *aKey, void *aData, void *closure);
static PRBool PR_CALLBACK writeFolderCache(nsHashKey *aKey, void *aData, void *closure);
static PRBool PR_CALLBACK closeCachedConnections(nsHashKey *aKey, void *aData, void *closure);
static char *getUniqueKey(const char* prefix, nsHashtable *hashTable);
static char *getUniqueAccountKey(const char* prefix,
@ -168,11 +174,11 @@ private:
nsCOMPtr<nsISupportsArray> mFolderListeners;
// add and remove listeners from the given server
static PRBool addListener(nsHashKey *aKey, void *element, void *aData);
static PRBool removeListener(nsHashKey *aKey, void *element, void *aData);
static PRBool PR_CALLBACK addListener(nsHashKey *aKey, void *element, void *aData);
static PRBool PR_CALLBACK removeListener(nsHashKey *aKey, void *element, void *aData);
// folder listener enumerators
static PRBool addListenerToFolder(nsISupports *element, void *data);
static PRBool removeListenerFromFolder(nsISupports *element, void *data);
static PRBool PR_CALLBACK addListenerToFolder(nsISupports *element, void *data);
static PRBool PR_CALLBACK removeListenerFromFolder(nsISupports *element, void *data);
};

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#include "msgCore.h" // precompiled header...
@ -266,7 +272,7 @@ void nsUInt32Array::CopyArray(nsUInt32Array &oldA)
/////////////////////////////////////////////////////////////////////////////
static int CompareDWord (const void *v1, const void *v2, void *)
static int PR_CALLBACK CompareDWord (const void *v1, const void *v2, void *)
{
// QuickSort callback to compare array values
PRUint32 i1 = *(PRUint32 *)v1;
@ -274,7 +280,7 @@ static int CompareDWord (const void *v1, const void *v2, void *)
return i1 - i2;
}
void nsUInt32Array::QuickSort (int (*compare) (const void *elem1, const void *elem2, void *data))
void nsUInt32Array::QuickSort (int (* PR_CALLBACK compare) (const void *elem1, const void *elem2, void *data))
{
if (m_nSize > 1)
NS_QuickSort(m_pData, m_nSize, sizeof(void*), compare ? compare : CompareDWord, nsnull);

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#ifndef _nsUInt32Array_H_
#define _nsUInt32Array_H_
@ -54,7 +60,7 @@ public:
void SetAtGrow(PRUint32 nIndex, PRUint32 newElement);
// Sorting member functions
void QuickSort(int (*compare) (const void *elem1, const void *elem2, void *) = NULL);
void QuickSort(int (* PR_CALLBACK compare) (const void *elem1, const void *elem2, void *) = NULL);
// Overloaded operators
PRUint32 operator[](PRUint32 nIndex) const { return GetAt(nIndex); }

Просмотреть файл

@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* IBM Corp.
*/
#ifndef __MSGSEND_H__
@ -448,7 +449,7 @@ protected:
//
extern int mime_write_message_body(nsMsgComposeAndSend *state, char *buf, PRInt32 size);
extern char *mime_get_stream_write_buffer(void);
extern int mime_encoder_output_fn (const char *buf, PRInt32 size, void *closure);
extern int PR_CALLBACK mime_encoder_output_fn (const char *buf, PRInt32 size, void *closure);
extern PRBool UseQuotedPrintable(void);
#endif /* __MSGSEND_H__ */

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#ifndef FORCE_PR_LOG
@ -82,7 +88,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
A pointer to this function is passed to XP_Maphash -km */
static PR_CALLBACK PRIntn
static PRIntn PR_CALLBACK
net_pop3_check_for_hash_messages_marked_delete(PLHashEntry* he,
PRIntn msgindex,
void *arg)
@ -212,7 +218,7 @@ net_pop3_load_state(const char* searchhost,
return result;
}
static PR_CALLBACK PRIntn
static PRIntn PR_CALLBACK
hash_clear_mapper(PLHashEntry* he, PRIntn msgindex, void* arg)
{
#ifdef UNREADY_CODE // mscott: the compiler won't take this line and I can't figure out why..=(
@ -221,7 +227,7 @@ hash_clear_mapper(PLHashEntry* he, PRIntn msgindex, void* arg)
return HT_ENUMERATE_REMOVE;
}
static PR_CALLBACK PRIntn
static PRIntn PR_CALLBACK
hash_empty_mapper(PLHashEntry* he, PRIntn msgindex, void* arg)
{
*((PRBool*) arg) = PR_FALSE;
@ -237,7 +243,7 @@ hash_empty(PLHashTable* hash)
}
static PR_CALLBACK PRIntn
static PRIntn PR_CALLBACK
net_pop3_write_mapper(PLHashEntry* he, PRIntn msgindex, void* arg)
{
nsOutputFileStream* file = (nsOutputFileStream*) arg;

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
/*
@ -88,14 +94,14 @@ public:
const char* inBuffer, const PRInt32 inLength, char** outBuffer, PRInt32* outLength,
PRInt32* numUnConverted) = 0;
NS_IMETHOD B64EncoderInit(int (*output_fn) (const char *buf, PRInt32 size, void *closure),
NS_IMETHOD B64EncoderInit(int (*PR_CALLBACK output_fn) (const char *buf, PRInt32 size, void *closure),
void *closure, MimeEncoderData **returnEncoderData) = 0;
NS_IMETHOD QPEncoderInit (int (*output_fn) (const char *buf,
NS_IMETHOD QPEncoderInit (int (*PR_CALLBACK output_fn) (const char *buf,
PRInt32 size, void *closure), void *closure,
MimeEncoderData ** returnEncoderData) = 0;
NS_IMETHOD UUEncoderInit (char *filename, int (*output_fn)
NS_IMETHOD UUEncoderInit (char *filename, int (*PR_CALLBACK output_fn)
(const char *buf, PRInt32 size, void *closure), void *closure,
MimeEncoderData ** returnEncoderData) = 0;

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
/*
* mimebuf.c - libmsg like buffer handling routines for libmime
@ -104,7 +110,7 @@ mime_ReBuffer (const char *net_buffer, PRInt32 net_buffer_size,
static int
convert_and_send_buffer(char* buf, int length, PRBool convert_newlines_p,
PRInt32 (*per_line_fn) (char *line,
PRInt32 (*PR_CALLBACK per_line_fn) (char *line,
PRUint32 line_length,
void *closure),
void *closure)
@ -155,7 +161,7 @@ extern "C" int
mime_LineBuffer (const char *net_buffer, PRInt32 net_buffer_size,
char **bufferP, PRInt32 *buffer_sizeP, PRUint32 *buffer_fpP,
PRBool convert_newlines_p,
PRInt32 (*per_line_fn) (char *line, PRUint32 line_length,
PRInt32 (*PR_CALLBACK per_line_fn) (char *line, PRUint32 line_length,
void *closure),
void *closure)
{

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#ifndef _MIMEBUF_H_
@ -39,7 +45,7 @@ extern "C" int mime_LineBuffer (const char *net_buffer, PRInt32 net_buffer_size,
char **bufferP, PRInt32 *buffer_sizeP,
PRInt32 *buffer_fpP,
PRBool convert_newlines_p,
PRInt32 (*per_line_fn) (char *line, PRInt32
PRInt32 (*PR_CALLBACK per_line_fn) (char *line, PRInt32
line_length, void *closure),
void *closure);

Просмотреть файл

@ -19,6 +19,12 @@
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#include "nsCOMPtr.h"
#include "modmimee.h"
@ -345,7 +351,7 @@ dummy_file_write( char *buf, PRInt32 size, void *fileHandle )
return tStream->write(buf, size);
}
static int
static int PR_CALLBACK
mime_parse_stream_write ( nsMIMESession *stream, const char *buf, PRInt32 size )
{
struct mime_draft_data *mdd = (struct mime_draft_data *) stream->data_object;
@ -1078,7 +1084,7 @@ mime_insert_forwarded_message_headers(char **body,
}
}
static void
static void PR_CALLBACK
mime_parse_stream_complete (nsMIMESession *stream)
{
struct mime_draft_data *mdd = (struct mime_draft_data *) stream->data_object;
@ -1466,7 +1472,7 @@ mime_parse_stream_complete (nsMIMESession *stream)
PR_FREEIF(draftInfo);
}
static void
static void PR_CALLBACK
mime_parse_stream_abort (nsMIMESession *stream, int status )
{
struct mime_draft_data *mdd = (struct mime_draft_data *) stream->data_object;

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#include "mimerosetta.h"
@ -96,7 +102,7 @@ nsVoidArray *ctHandlerList = NULL;
PRBool foundIt = PR_FALSE;
PRBool force_display = PR_FALSE;
PRBool
PRBool PR_CALLBACK
EnumFunction(void* aElement, void *aData)
{
cthandler_struct *ptr = (cthandler_struct *) aElement;
@ -1312,7 +1318,7 @@ MimeObject_output_init(MimeObject *obj, const char *content_type)
// Set the charset on the channel we are dealing with so people know
// what the charset is set to. Do this for quoting/Printing ONLY!
//
extern void ResetChannelCharset(MimeObject *obj);
extern void PR_CALLBACK ResetChannelCharset(MimeObject *obj);
if ( (obj->options) &&
( (obj->options->format_out == nsMimeOutput::nsMimeMessageQuoting) ||
(obj->options->format_out == nsMimeOutput::nsMimeMessageBodyQuoting) ||

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
/* Thoughts on how to implement this:
@ -179,8 +185,8 @@ MimeMultipartRelated_initialize(MimeObject* obj)
return ((MimeObjectClass*)&MIME_SUPERCLASS)->initialize(obj);
}
static PR_CALLBACK
PRIntn mime_multipart_related_nukehash(PLHashEntry *table,
static PRIntn PR_CALLBACK
mime_multipart_related_nukehash(PLHashEntry *table,
PRIntn indx, void *arg)
{
if (table->key)

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#include "mimeobj.h"
@ -241,7 +247,7 @@ MimeObject_parse_buffer (char *buffer, PRInt32 size, MimeObject *obj)
return mime_LineBuffer (buffer, size,
&obj->ibuffer, &obj->ibuffer_size, &obj->ibuffer_fp,
PR_TRUE,
((int (*) (char *, PRInt32, void *))
((int (*PR_CALLBACK) (char *, PRInt32, void *))
/* This cast is to turn void into MimeObject */
obj->clazz->parse_line),
obj);

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
#include "mimetext.h"
#include "libi18n.h"
@ -253,7 +259,7 @@ MimeInlineText_parse_decoded_buffer (char *buf, PRInt32 size, MimeObject *obj)
return mime_LineBuffer (buf, size,
&obj->ibuffer, &obj->ibuffer_size, &obj->ibuffer_fp,
PR_TRUE,
((int (*) (char *, PRInt32, void *))
((int (*PR_CALLBACK) (char *, PRInt32, void *))
/* This cast is to turn void into MimeObject */
MimeInlineText_rotate_convert_and_parse_line),
obj);

Просмотреть файл

@ -18,6 +18,12 @@
* Rights Reserved.
*
* Contributor(s):
* This Original Code has been modified by IBM Corporation. Modifications made by IBM
* described herein are Copyright (c) International Business Machines Corporation, 2000.
* Modifications to Mozilla code or documentation identified per MPL Section 3.3
*
* Date Modified by Description of modification
* 04/20/2000 IBM Corp. OS/2 VisualAge build.
*/
/*
@ -78,14 +84,14 @@ public:
const char* inBuffer, const PRInt32 inLength, char** outBuffer, PRInt32* outLength,
PRInt32* numUnConverted);
NS_IMETHOD B64EncoderInit(int (*output_fn) (const char *buf, PRInt32 size, void *closure),
NS_IMETHOD B64EncoderInit(int (*PR_CALLBACK output_fn) (const char *buf, PRInt32 size, void *closure),
void *closure, MimeEncoderData **returnEncoderData);
NS_IMETHOD QPEncoderInit (int (*output_fn) (const char *buf,
NS_IMETHOD QPEncoderInit (int (*PR_CALLBACK output_fn) (const char *buf,
PRInt32 size, void *closure), void *closure,
MimeEncoderData ** returnEncoderData);
NS_IMETHOD UUEncoderInit (char *filename, int (*output_fn)
NS_IMETHOD UUEncoderInit (char *filename, int (*PR_CALLBACK output_fn)
(const char *buf, PRInt32 size, void *closure), void *closure,
MimeEncoderData ** returnEncoderData);