fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-03-28 12:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbgs/core.c
    ! Fixed C++ warning.

  * contrib/hbmxml/3rd/minixml/mxml.hbp
  * contrib/hbmxml/3rd/minixml/mxml_fil.c
  * contrib/hbmxml/3rd/minixml/mxml_nod.c
  - contrib/hbmxml/3rd/minixml/minixml.dif
    * Updated.

  ; Patches from Tamas Tevesz.
This commit is contained in:
Viktor Szakats
2011-03-28 10:14:12 +00:00
parent 72e2cdf475
commit 583afbcdf4
6 changed files with 50 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -16,6 +16,18 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-03-28 12:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbgs/core.c
! Fixed C++ warning.
* contrib/hbmxml/3rd/minixml/mxml.hbp
* contrib/hbmxml/3rd/minixml/mxml_fil.c
* contrib/hbmxml/3rd/minixml/mxml_nod.c
- contrib/hbmxml/3rd/minixml/minixml.dif
* Updated.
; Patches from Tamas Tevesz.
2011-03-28 01:19 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtcore/hbqt_hbqevents.cpp
* contrib/hbqt/qtcore/hbqt_hbqslots.cpp
@@ -103,7 +115,7 @@
* contrib/hbide/idemain.prg
* contrib/hbide/ideprojmanager.prg
* contrib/hbide/idesaveload.prg
! Optimized: destructors. Unreleased memory blocks are shortened
! Optimized: destructors. Unreleased memory blocks are shortened
in number considerably.
+ Project Properties dialog now displays project name in its title-bar.

2
harbour/contrib/hbgs/core.c
View File

@@ -74,7 +74,7 @@ HB_FUNC( HB_GS )
int code, code1;
char ** gsargv = ( char ** ) hb_xgrab( gsargc * sizeof( const char * ) );
gsargv[ 0 ] = "hbgs"; /* actual value doesn't matter */
gsargv[ 0 ] = ( char * ) "hbgs"; /* actual value doesn't matter */
for( pos = 1; pos < gsargc; ++pos )
{

67
harbour/contrib/hbmxml/3rd/minixml/minixml.dif
View File

@@ -1,67 +0,0 @@
diff -urN minixml.orig/mxml_ent.c minixml/mxml_ent.c
--- minixml.orig/mxml_ent.c 2010-09-23 18:43:55 +0000
+++ minixml/mxml_ent.c 2011-01-03 12:18:47 +0000
@@ -30,7 +30,7 @@
* Include necessary headers...
*/
-#include "mxml-private.h"
+#include "mxml_pri.h"
/*
diff -urN minixml.orig/mxml_fil.c minixml/mxml_fil.c
--- minixml.orig/mxml_fil.c 2010-09-23 18:43:54 +0000
+++ minixml/mxml_fil.c 2011-01-03 12:18:52 +0000
@@ -56,7 +56,7 @@
#ifndef WIN32
# include <unistd.h>
#endif /* !WIN32 */
-#include "mxml-private.h"
+#include "mxml_pri.h"
/*
diff -urN minixml.orig/mxml_pri.c minixml/mxml_pri.c
--- minixml.orig/mxml_pri.c 2010-11-13 15:14:56 +0000
+++ minixml/mxml_pri.c 2011-01-03 12:18:37 +0000
@@ -1,5 +1,5 @@
/*
- * "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $"
+ * "$Id: mxml_pri.c 422 2010-11-07 22:55:11Z mike $"
*
* Private functions for Mini-XML, a small XML-like file parsing library.
*
@@ -26,7 +26,7 @@
* Include necessary headers...
*/
-#include "mxml-private.h"
+#include "mxml_pri.h"
/*
@@ -327,5 +327,5 @@
/*
- * End of "$Id: mxml-private.c 422 2010-11-07 22:55:11Z mike $".
+ * End of "$Id: mxml_pri.c 422 2010-11-07 22:55:11Z mike $".
*/
diff -urN minixml.orig/mxml_pri.h minixml/mxml_pri.h
--- minixml.orig/mxml_pri.h 2010-09-23 18:43:54 +0000
+++ minixml/mxml_pri.h 2011-01-03 12:19:04 +0000
@@ -1,5 +1,5 @@
/*
- * "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $"
+ * "$Id: mxml_pri.h 408 2010-09-19 05:26:46Z mike $"
*
* Private definitions for Mini-XML, a small XML-like file parsing library.
*
@@ -46,5 +46,5 @@
/*
- * End of "$Id: mxml-private.h 408 2010-09-19 05:26:46Z mike $".
+ * End of "$Id: mxml_pri.h 408 2010-09-19 05:26:46Z mike $".
*/

2
harbour/contrib/hbmxml/3rd/minixml/mxml.hbp
View File

@@ -41,8 +41,8 @@ mxml_str.c
# MAP mxml-index.c mxml_ind.c
# MAP mxml-node.c mxml_nod.c
# MAP mxml-private.c mxml_pri.c
# MAP mxml-private.h mxml_pri.h
# MAP mxml-search.c mxml_sea.c
# MAP mxml-set.c mxml_set.c
# MAP mxml-string.c mxml_str.c
# MAP mxml.h mxml.h
# MAP mxml-private.h mxml_pri.h

29
harbour/contrib/hbmxml/3rd/minixml/mxml_fil.c
View File

@@ -1,9 +1,9 @@
/*
* "$Id: mxml-file.c 415 2010-09-19 07:29:46Z mike $"
* "$Id: mxml-file.c 438 2011-03-24 05:47:51Z mike $"
*
* File loading code for Mini-XML, a small XML-like file parsing library.
*
* Copyright 2003-2010 by Michael R Sweet.
* Copyright 2003-2011 by Michael R Sweet.
*
* These coded instructions, statements, and computer programs are the
* property of Michael R Sweet and are protected by Federal copyright
@@ -1582,19 +1582,22 @@ mxml_load_data(
if (ch == '<' && whitespace && type == MXML_TEXT)
{
node = mxmlNewText(parent, whitespace, "");
if (sax_cb)
if (parent)
{
(*sax_cb)(node, MXML_SAX_DATA, sax_data);
node = mxmlNewText(parent, whitespace, "");
if (!mxmlRelease(node))
node = NULL;
if (sax_cb)
{
(*sax_cb)(node, MXML_SAX_DATA, sax_data);
if (!mxmlRelease(node))
node = NULL;
}
if (!first && node)
first = node;
}
if (!first && node)
first = node;
whitespace = 0;
}
@@ -1964,7 +1967,7 @@ mxml_load_data(
(*sax_cb)(node, MXML_SAX_ELEMENT_CLOSE, sax_data);
if (!mxmlRelease(node) && first == node)
first = NULL;
first = NULL;
}
/*
@@ -3106,5 +3109,5 @@ mxml_write_ws(mxml_node_t *node, /* I - Current node */
/*
* End of "$Id: mxml-file.c 415 2010-09-19 07:29:46Z mike $".
* End of "$Id: mxml-file.c 438 2011-03-24 05:47:51Z mike $".
*/

26
harbour/contrib/hbmxml/3rd/minixml/mxml_nod.c
View File

@@ -1,5 +1,5 @@
/*
* "$Id: mxml-node.c 427 2011-01-03 02:03:29Z mike $"
* "$Id: mxml-node.c 436 2011-01-22 01:02:05Z mike $"
*
* Node support code for Mini-XML, a small XML-like file parsing library.
*
@@ -15,6 +15,22 @@
*
* Contents:
*
* mxmlAdd() - Add a node to a tree.
* mxmlDelete() - Delete a node and all of its children.
* mxmlGetRefCount() - Get the current reference (use) count for a node.
* mxmlNewCDATA() - Create a new CDATA node.
* mxmlNewCustom() - Create a new custom data node.
* mxmlNewElement() - Create a new element node.
* mxmlNewInteger() - Create a new integer node.
* mxmlNewOpaque() - Create a new opaque string.
* mxmlNewReal() - Create a new real number node.
* mxmlNewText() - Create a new text fragment node.
* mxmlNewTextf() - Create a new formatted text fragment node.
* mxmlRemove() - Remove a node from its parent.
* mxmlNewXML() - Create a new XML document tree.
* mxmlRelease() - Release a node.
* mxmlRetain() - Retain a node.
* mxml_new() - Create a new node.
*/
/*
@@ -205,11 +221,7 @@ mxmlDelete(mxml_node_t *node) /* I - Node to delete */
*/
while (node->child)
{
mxml_node_t *child = node->child;
mxmlRemove(child);
mxmlRelease(child);
}
mxmlDelete(node->child);
/*
* Now delete any node data...
@@ -791,5 +803,5 @@ mxml_new(mxml_node_t *parent, /* I - Parent node */
/*
* End of "$Id: mxml-node.c 427 2011-01-03 02:03:29Z mike $".
* End of "$Id: mxml-node.c 436 2011-01-22 01:02:05Z mike $".
*/