[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libamf/element.cpp libamf/eleme...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog libamf/element.cpp libamf/eleme... |
|
Date: |
Tue, 15 Jan 2008 14:58:16 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/01/15 14:58:16
Modified files:
. : ChangeLog
libamf : element.cpp element.h lcshm.cpp lcshm.h sol.cpp
sol.h
utilities : soldumper.cpp
Log message:
fix a bunch of compiler warnings.
The code isn't any better, but error stream is less polluted...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5403&r2=1.5404
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/element.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/element.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/lcshm.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/lcshm.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/sol.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/sol.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/soldumper.cpp?cvsroot=gnash&r1=1.2&r2=1.3
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5403
retrieving revision 1.5404
diff -u -b -r1.5403 -r1.5404
--- ChangeLog 15 Jan 2008 14:17:43 -0000 1.5403
+++ ChangeLog 15 Jan 2008 14:58:14 -0000 1.5404
@@ -1,5 +1,12 @@
2008-01-15 Sandro Santilli <address@hidden>
+ * libamf/: element.{cpp,h}, lcshm.{cpp,h}, sol.{cpp,h},
+ utilities/soldumper.cpp: fix a bunch of compiler warnings.
+ The code isn't any better, but error stream is less
+ polluted...
+
+2008-01-15 Sandro Santilli <address@hidden>
+
* server/edit_text_character.cpp: initialize TextField as an
AsBroadcaster, broadcast onChanged events (it seems onKillFocus
and onSetFocus should not... no idea why).
Index: libamf/element.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/element.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libamf/element.cpp 5 Jan 2008 17:44:44 -0000 1.4
+++ libamf/element.cpp 15 Jan 2008 14:58:15 -0000 1.5
@@ -417,10 +417,10 @@
void
Element::dump()
{
- log_debug("AMF Type is: ", astype_str[_type]);
- log_debug("AMF Length is: ", _length);
+ log_debug("AMF Type is: %s", astype_str[_type]);
+ log_debug("AMF Length is: %d", _length);
if (_name.size()) {
- log_debug("AMF Name is: ", _name.c_str());
+ log_debug("AMF Name is: %s", _name.c_str());
}
#if 0
boost::uint8_t *hexint;
Index: libamf/element.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/element.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libamf/element.h 5 Jan 2008 17:44:45 -0000 1.4
+++ libamf/element.h 15 Jan 2008 14:58:15 -0000 1.5
@@ -95,8 +95,8 @@
Element &operator=(Element &);
- bool operator==(bool x) { if (_data) return _data[0] == x; };
- uint8_t operator[](int x) { if (_data) return _data[x]; };
+ bool operator==(bool x) { if (_data) return _data[0] == x; return false; };
+ uint8_t operator[](int x) { if (_data) return _data[x]; return 0; };
// These are all accessors for the various output formats
astype_e getType() { return _type; };
Index: libamf/lcshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/lcshm.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libamf/lcshm.cpp 31 Dec 2007 00:26:48 -0000 1.2
+++ libamf/lcshm.cpp 15 Jan 2008 14:58:15 -0000 1.3
@@ -213,12 +213,12 @@
#endif
vector<amf::Element *>
-LcShm::parseBody(boost::uint8_t *data)
+LcShm::parseBody(boost::uint8_t * /*data*/)
{
GNASH_REPORT_FUNCTION;
- boost::uint8_t *ptr = reinterpret_cast<uint8_t *>(data);
- Element::astype_e type = (Element::astype_e)*ptr;
+ //boost::uint8_t *ptr = reinterpret_cast<uint8_t *>(data);
+ //Element::astype_e type = (Element::astype_e)*ptr;
// log_msg(_("Type is %s"), astype_str[type]);
amf::Element el;
AMF amf;
@@ -297,9 +297,10 @@
}
boost::uint8_t *
-LcShm::formatHeader(boost::uint8_t *data)
+LcShm::formatHeader(boost::uint8_t * /*data*/)
{
GNASH_REPORT_FUNCTION;
+ return NULL;
}
/// \brief Prepares the LcShm object to receive commands from a
@@ -334,11 +335,13 @@
{
GNASH_REPORT_FUNCTION;
+ return false;
+
}
/// \brief Invokes a method on a specified LcShm object.
void
-LcShm::send(std::string &name, std::string &dataname, amf::Element *data)
+LcShm::send(const std::string & /*name*/, const std::string & /*dataname*/,
amf::Element * /*data*/)
{
log_unimpl (__FUNCTION__);
Index: libamf/lcshm.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/lcshm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libamf/lcshm.h 31 Dec 2007 00:26:48 -0000 1.2
+++ libamf/lcshm.h 15 Jan 2008 14:58:15 -0000 1.3
@@ -75,7 +75,7 @@
~LcShm();
bool connect(std::string &name);
void close(void);
- void send(std::string &name, std::string &dataname, amf::Element *data);
+ void send(const std::string &name, const std::string &dataname,
amf::Element *data);
void recv(std::string &name, std::string &dataname, amf::Element *data);
std::vector<amf::Element *> parseBody(boost::uint8_t *data);
boost::uint8_t *parseHeader(boost::uint8_t *data);
Index: libamf/sol.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/sol.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libamf/sol.cpp 5 Jan 2008 10:58:05 -0000 1.14
+++ libamf/sol.cpp 15 Jan 2008 14:58:15 -0000 1.15
@@ -74,21 +74,23 @@
vector<amf::Element *>::iterator it;
for (it = _amfobjs.begin(); it != _amfobjs.end(); it++) {
- amf::Element *el = (*(it));
+ //amf::Element *el = (*(it));
// delete el;
}
}
bool
-SOL::extractHeader(std::string &filespec)
+SOL::extractHeader(const std::string & /*filespec*/)
{
// GNASH_REPORT_FUNCTION;
+ return false;
}
bool
-SOL::extractHeader(vector<unsigned char> &data)
+SOL::extractHeader(const vector<unsigned char> & /*data*/)
{
// GNASH_REPORT_FUNCTION;
+ return false;
}
void
@@ -100,9 +102,10 @@
}
bool
-SOL::formatHeader(vector<unsigned char> &data)
+SOL::formatHeader(vector<unsigned char> & /*data*/)
{
// GNASH_REPORT_FUNCTION;
+ return false;
}
// name is the object name
@@ -187,6 +190,7 @@
delete hexint;
#endif
+ return true;
}
// write the data to disk as a .sol file
@@ -290,6 +294,8 @@
// ofs.write(body, (ptr - body));
ofs.write(body, _filesize);
ofs.close();
+
+ return true;
}
// read the .sol file from disk
Index: libamf/sol.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/sol.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libamf/sol.h 31 Dec 2007 00:26:48 -0000 1.5
+++ libamf/sol.h 15 Jan 2008 14:58:15 -0000 1.6
@@ -48,8 +48,8 @@
size_t size() { return _amfobjs.size(); };
// extract the header
- bool extractHeader(std::vector<boost::uint8_t> &data);
- bool extractHeader(std::string &filespec);
+ bool extractHeader(const std::vector<boost::uint8_t> &data);
+ bool extractHeader(const std::string &filespec);
// Create the header
bool formatHeader(std::vector<boost::uint8_t> &data);
Index: utilities/soldumper.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/soldumper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- utilities/soldumper.cpp 31 Dec 2007 03:11:28 -0000 1.2
+++ utilities/soldumper.cpp 15 Jan 2008 14:58:15 -0000 1.3
@@ -58,7 +58,7 @@
int c;
bool localdir = false;
bool listdir = false;
- int size = 0;
+ //int size = 0;
string filespec, realname, tmpname;
struct dirent *entry;
vector<const char *> dirlist;
@@ -136,7 +136,7 @@
for (i=0; entry>0; i++) {
entry = readdir(library_dir);
if (entry != NULL) {
- string::size_type pos;
+ //string::size_type pos;
if (strstr(entry->d_name, ".sol")) {
cout << "Found SOL: " << entry->d_name << endl;
}