Revision: 7359
http://mahogany.svn.sourceforge.net/mahogany/?rev=7359&view=rev
Author: vadz
Date: 2007-09-07 10:29:18 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
modified vCard functions working with file names to use const char * instead of
char *; removed the previous workarounds for non-const functions
Modified Paths:
--------------
trunk/M/src/wx/common/vcard.cpp
trunk/M/src/wx/vcard/vcc.c-yacc
trunk/M/src/wx/vcard/vcc.h
trunk/M/src/wx/vcard/vcc.y
trunk/M/src/wx/vcard/versit.vcproj
trunk/M/src/wx/vcard/vobject.c
trunk/M/src/wx/vcard/vobject.h
Modified: trunk/M/src/wx/common/vcard.cpp
===================================================================
--- trunk/M/src/wx/common/vcard.cpp 2007-09-07 16:01:06 UTC (rev 7358)
+++ trunk/M/src/wx/common/vcard.cpp 2007-09-07 17:29:18 UTC (rev 7359)
@@ -116,10 +116,7 @@
/* static */ wxArrayCards wxVCard::CreateFromFile(const wxString& filename)
{
wxArrayCards vcards;
- char *filename1 = new char[strlen(filename.fn_str())+1];
- strcpy(filename1, filename.fn_str());
-
- VObject *vObj = Parse_MIME_FromFileName(filename1);
+ VObject *vObj = Parse_MIME_FromFileName(filename);
if ( !vObj )
{
wxLogError(_("The file '%s' doesn't contain any vCard objects."),
@@ -138,7 +135,7 @@
vObj = nextVObjectInList(vObj);
}
}
- delete [] filename1;
+
return vcards;
}
@@ -691,24 +688,16 @@
// Write() to a file
bool wxVCardObject::Write(const wxString& filename) const
{
- char *filename1 = new char[strlen(filename.fn_str())+1];
- strcpy(filename1, filename.fn_str());
+ writeVObjectToFile(filename, m_vObj);
- writeVObjectToFile(filename1, m_vObj);
-
- delete [] filename1;
return TRUE; // writeVObjectToFile() is void @[EMAIL PROTECTED]@!!
}
// write out the internal representation
void wxVCardObject::Dump(const wxString& filename)
{
- char *filename1 = new char[strlen(filename.fn_str())+1];
- strcpy(filename1, filename.fn_str());
-
// it is ok for m_vObj to be NULL
- printVObjectToFile(filename1, m_vObj);
- delete [] filename1;
+ printVObjectToFile(filename, m_vObj);
}
// ============================================================================
Modified: trunk/M/src/wx/vcard/vcc.c-yacc
===================================================================
--- trunk/M/src/wx/vcard/vcc.c-yacc 2007-09-07 16:01:06 UTC (rev 7358)
+++ trunk/M/src/wx/vcard/vcc.c-yacc 2007-09-07 17:29:18 UTC (rev 7359)
@@ -1197,7 +1197,7 @@
return result;
}
-DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
+DLLEXPORT(VObject*) Parse_MIME_FromFileName(const char *fname)
{
FILE *fp = fopen(fname,"r");
if (fp) {
Modified: trunk/M/src/wx/vcard/vcc.h
===================================================================
--- trunk/M/src/wx/vcard/vcc.h 2007-09-07 16:01:06 UTC (rev 7358)
+++ trunk/M/src/wx/vcard/vcc.h 2007-09-07 17:29:18 UTC (rev 7359)
@@ -51,7 +51,7 @@
extern DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler);
extern DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len);
-extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(char* fname);
+extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(const char* fname);
/* NOTE regarding Parse_MIME_FromFile
Modified: trunk/M/src/wx/vcard/vcc.y
===================================================================
--- trunk/M/src/wx/vcard/vcc.y 2007-09-07 16:01:06 UTC (rev 7358)
+++ trunk/M/src/wx/vcard/vcc.y 2007-09-07 17:29:18 UTC (rev 7359)
@@ -1166,7 +1166,7 @@
return result;
}
-DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
+DLLEXPORT(VObject*) Parse_MIME_FromFileName(const char *fname)
{
FILE *fp = fopen(fname,"r");
if (fp) {
Modified: trunk/M/src/wx/vcard/versit.vcproj
===================================================================
--- trunk/M/src/wx/vcard/versit.vcproj 2007-09-07 16:01:06 UTC (rev 7358)
+++ trunk/M/src/wx/vcard/versit.vcproj 2007-09-07 17:29:18 UTC (rev 7359)
@@ -93,7 +93,7 @@
ProgramDataBaseFileName=".\Debug/"
WarningLevel="1"
SuppressStartupBanner="TRUE"
- DebugInformationFormat="4"/>
+ DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Modified: trunk/M/src/wx/vcard/vobject.c
===================================================================
--- trunk/M/src/wx/vcard/vobject.c 2007-09-07 16:01:06 UTC (rev 7358)
+++ trunk/M/src/wx/vcard/vobject.c 2007-09-07 17:29:18 UTC (rev 7359)
@@ -565,7 +565,7 @@
printVObject_(fp,o,0);
}
-DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o)
+DLLEXPORT(void) printVObjectToFile(const char *fname,VObject *o)
{
FILE *fp = fopen(fname,"w");
if (fp) {
@@ -574,7 +574,7 @@
}
}
-DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list)
+DLLEXPORT(void) printVObjectsToFile(const char *fname,VObject *list)
{
FILE *fp = fopen(fname,"w");
if (fp) {
@@ -1350,7 +1350,7 @@
writeVObject_(&ofp,o);
}
-DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o)
+DLLEXPORT(void) writeVObjectToFile(const char *fname, VObject *o)
{
FILE *fp = fopen(fname,"w");
if (fp) {
@@ -1359,7 +1359,7 @@
}
}
-DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
+DLLEXPORT(void) writeVObjectsToFile(const char *fname, VObject *list)
{
FILE *fp = fopen(fname,"w");
if (fp) {
Modified: trunk/M/src/wx/vcard/vobject.h
===================================================================
--- trunk/M/src/wx/vcard/vobject.h 2007-09-07 16:01:06 UTC (rev 7358)
+++ trunk/M/src/wx/vcard/vobject.h 2007-09-07 17:29:18 UTC (rev 7359)
@@ -314,10 +314,10 @@
extern DLLEXPORT(int) uStrLen(const wchar_t *u);
extern DLLEXPORT(char*) fakeCString(const wchar_t *u);
-extern DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o);
-extern DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list);
-extern DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o);
-extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);
+extern DLLEXPORT(void) printVObjectToFile(const char *fname,VObject *o);
+extern DLLEXPORT(void) printVObjectsToFile(const char *fname,VObject *list);
+extern DLLEXPORT(void) writeVObjectToFile(const char *fname, VObject *o);
+extern DLLEXPORT(void) writeVObjectsToFile(const char *fname, VObject *list);
extern DLLEXPORT(int) vObjectValueType(VObject *o);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
