[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1352-g1c0cad2 |
|
Date: |
Thu, 29 Dec 2011 20:57:45 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 1c0cad2a02e823c0ad0b78b6703e4c5fad924c50 (commit)
from 54fa1b981b9188f2514ef69783a8011fe5e89132 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=1c0cad2a02e823c0ad0b78b6703e4c5fad924c50
commit 1c0cad2a02e823c0ad0b78b6703e4c5fad924c50
Author: Rob Savoye <address@hidden>
Date: Thu Dec 29 13:57:41 2011 -0700
add macro so new strings get found by xgettext, so they can be translated.
diff --git a/libbase/AMF.cpp b/libbase/AMF.cpp
index 28e7726..634cf1f 100644
--- a/libbase/AMF.cpp
+++ b/libbase/AMF.cpp
@@ -56,7 +56,7 @@ readBoolean(const boost::uint8_t*& pos, const boost::uint8_t*
_end)
const bool val = *pos;
++pos;
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug("amf0 read bool: %d", val);
+ log_debug(_("amf0 read bool: %d"), val);
#endif
return val;
}
@@ -77,7 +77,7 @@ readNumber(const boost::uint8_t*& pos, const boost::uint8_t*
end)
swapBytes(&d, 8);
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug("amf0 read double: %e", dub);
+ log_debug(_("amf0 read double: %e"), dub);
#endif
return d;
@@ -87,20 +87,20 @@ std::string
readString(const boost::uint8_t*& pos, const boost::uint8_t* end)
{
if (end - pos < 2) {
- throw AMFException("Read past _end of buffer for string length");
+ throw AMFException(_("Read past _end of buffer for string length"));
}
const boost::uint16_t si = readNetworkShort(pos);
pos += 2;
if (end - pos < si) {
- throw AMFException("Read past _end of buffer for string type");
+ throw AMFException(_("Read past _end of buffer for string type"));
}
const std::string str(reinterpret_cast<const char*>(pos), si);
pos += si;
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug("amf0 read string: %s", str);
+ log_debug(_("amf0 read string: %s"), str);
#endif
return str;
}
@@ -122,7 +122,7 @@ readLongString(const boost::uint8_t*& pos, const
boost::uint8_t* end)
pos += si;
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug("amf0 read long string: %s", str);
+ log_debug(_("amf0 read long string: %s"), str);
#endif
return str;
@@ -135,7 +135,7 @@ writePlainString(SimpleBuffer& buf, const std::string& str,
Type t)
const size_t len = str.size();
switch (t) {
default:
- log_error("writePlainString called with invalid type!");
+ log_error(_("writePlainString called with invalid type!"));
return;
case LONG_STRING_AMF0:
diff --git a/libbase/BitsReader.h b/libbase/BitsReader.h
index 1f6d783..7a06276 100644
--- a/libbase/BitsReader.h
+++ b/libbase/BitsReader.h
@@ -168,7 +168,7 @@ private:
{
if ( ++ptr == end )
{
- log_debug("Going round");
+ log_debug(_("Going round"));
ptr=start;
}
usedBits=0;
diff --git a/libbase/ClockTime.cpp b/libbase/ClockTime.cpp
index 168668a..d6c8e2e 100644
--- a/libbase/ClockTime.cpp
+++ b/libbase/ClockTime.cpp
@@ -147,7 +147,7 @@ clocktime::getTimeZoneOffset(double time)
// tm_gmtoff is in seconds east of GMT; convert to minutes.
offset = tm.tm_gmtoff / 60;
- //gnash::log_debug("Using tm.tm_gmtoff. Offset is %d", offset);
+ //gnash::log_debug(_("Using tm.tm_gmtoff. Offset is %d"), offset);
return offset;
#else
@@ -167,7 +167,7 @@ clocktime::getTimeZoneOffset(double time)
tzset();
// timezone is seconds west of GMT
offset = -timezone / 60;
- //gnash::log_debug("Using tzset. Offset is %d", offset);
+ //gnash::log_debug(_("Using tzset. Offset is %d"), offset);
# elif !defined(WIN32) && defined(HAVE_GETTIMEOFDAY)
@@ -185,7 +185,7 @@ clocktime::getTimeZoneOffset(double time)
struct timezone tz;
gettimeofday(&tv, &tz);
offset = -tz.tz_minuteswest;
- //gnash::log_debug("Using gettimeofday. Offset is %d", offset);
+ //gnash::log_debug(_("Using gettimeofday. Offset is %d"), offset);
# elif defined(HAVE_FTIME)
// ftime(3): "These days the contents of the timezone and dstflag
@@ -220,8 +220,7 @@ clocktime::getTimeZoneOffset(double time)
else {
// tm_isdst is negative: cannot get TZ info.
// Convert and print in UTC instead.
- LOG_ONCE(
- gnash::log_error(_("Cannot get requested timezone information"));
+ LOG_ONCE(log_error(_("Cannot get requested timezone information"));
);
offset = 0;
}
diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
index 816d7e5..c393085 100644
--- a/libbase/GnashImage.cpp
+++ b/libbase/GnashImage.cpp
@@ -176,7 +176,7 @@ Output::writeImageData(FileType type,
outChannel = JpegOutput::create(out, width, height, quality);
break;
default:
- log_error("Requested to write image as unsupported filetype");
+ log_error(_("Requested to write image as unsupported filetype"));
break;
}
@@ -232,7 +232,7 @@ Input::readImageData(boost::shared_ptr<IOChannel> in,
FileType type)
im.reset(new ImageRGBA(width, height));
break;
default:
- log_error("Invalid image returned");
+ log_error(_("Invalid image returned"));
return im;
}
}
@@ -240,7 +240,7 @@ Input::readImageData(boost::shared_ptr<IOChannel> in,
FileType type)
// This should be caught here because ~JpegInput can also
// throw an exception on stack unwinding and this confuses
// remote catchers.
- log_error("Out of memory while trying to create %dx%d image",
+ log_error(_("Out of memory while trying to create %dx%d image"),
width, height);
return im;
}
diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index 6860d29..e035620 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -429,14 +429,14 @@ JpegInput::readScanline(unsigned char* rgb_data)
void
JpegInput::errorOccurred(const char* msg)
{
- log_debug("Long jump: banzaaaaaai!");
- _errorOccurred = msg;
-
- // Mark the compressor as closed so we can open another image
- // with this instance. We should throw on any errors, so there
- // should be no further activity on the current image.
- if (_compressorOpened) _compressorOpened = false;
- std::longjmp(_jmpBuf, 1);
+ log_debug(_("Long jump: banzaaaaaai!"));
+ _errorOccurred = msg;
+
+ // Mark the compressor as closed so we can open another image
+ // with this instance. We should throw on any errors, so there
+ // should be no further activity on the current image.
+ if (_compressorOpened) _compressorOpened = false;
+ std::longjmp(_jmpBuf, 1);
}
// Create and read a new image, using a input object that
diff --git a/libbase/GnashImagePng.cpp b/libbase/GnashImagePng.cpp
index 5a13cf1..724f065 100644
--- a/libbase/GnashImagePng.cpp
+++ b/libbase/GnashImagePng.cpp
@@ -245,13 +245,13 @@ PngInput::read()
// Convert indexed images to RGB
if (type == PNG_COLOR_TYPE_PALETTE) {
- log_debug("Converting palette PNG to RGB(A)");
+ log_debug(_("Converting palette PNG to RGB(A)"));
png_set_palette_to_rgb(_pngPtr);
}
// Convert less-than-8-bit greyscale to 8 bit.
if (type == PNG_COLOR_TYPE_GRAY && bitDepth < 8) {
- log_debug("Setting grey bit depth(%d) to 8", bitDepth);
+ log_debug(_("Setting grey bit depth(%d) to 8"), bitDepth);
#if PNG_LIBPNG_VER_MINOR < 4
png_set_gray_1_2_4_to_8(_pngPtr);
#else
@@ -261,7 +261,7 @@ PngInput::read()
// Apply the transparency block if it exists.
if (png_get_valid(_pngPtr, _infoPtr, PNG_INFO_tRNS)) {
- log_debug("Applying transparency block, image is RGBA");
+ log_debug(_("Applying transparency block, image is RGBA"));
png_set_tRNS_to_alpha(_pngPtr);
_type = TYPE_RGBA;
}
@@ -272,18 +272,18 @@ PngInput::read()
// Set the type of the image if it hasn't been set already.
if (_type == GNASH_IMAGE_INVALID) {
if (type & PNG_COLOR_MASK_ALPHA) {
- log_debug("Loading PNG image with alpha");
+ log_debug(_("Loading PNG image with alpha"));
_type = TYPE_RGBA;
}
else {
- log_debug("Loading PNG image without alpha");
+ log_debug(_("Loading PNG image without alpha"));
_type = TYPE_RGB;
}
}
// Convert 1-channel grey images to 3-channel RGB.
if (type == PNG_COLOR_TYPE_GRAY || type == PNG_COLOR_TYPE_GRAY_ALPHA) {
- log_debug("Converting greyscale PNG to RGB(A)");
+ log_debug(_("Converting greyscale PNG to RGB(A)"));
png_set_gray_to_rgb(_pngPtr);
}
diff --git a/libbase/GnashVaapiImage.cpp b/libbase/GnashVaapiImage.cpp
index df3bc95..6b5abcb 100644
--- a/libbase/GnashVaapiImage.cpp
+++ b/libbase/GnashVaapiImage.cpp
@@ -47,13 +47,13 @@
GnashVaapiImage::GnashVaapiImage(boost::shared_ptr<VaapiSurface> surface,
_surface(surface),
_creation_time(get_ticks_usec())
{
- log_debug("GnashVaapiImage::GnashVaapiImage(): surface 0x%08x, size
%dx%d\n",
+ log_debug(_("GnashVaapiImage::GnashVaapiImage(): surface 0x%08x, size
%dx%d\n"),
_surface->get(), _width, _height);
}
GnashVaapiImage::~GnashVaapiImage()
{
- log_debug("GnashVaapiImage::~GnashVaapiImage(): surface 0x%08x\n",
+ log_debug(_("GnashVaapiImage::~GnashVaapiImage(): surface 0x%08x\n"),
_surface->get());
}
@@ -65,7 +65,7 @@ void GnashVaapiImage::update(boost::shared_ptr<VaapiSurface>
surface)
void GnashVaapiImage::update(boost::uint8_t* data)
{
- log_debug("GnashVaapi::update(): data %p\n", data);
+ log_debug(_("GnashVaapi::update(): data %p\n"), data);
// XXX: use vaPutImage()
_creation_time = get_ticks_usec();
@@ -97,7 +97,7 @@ bool GnashVaapiImage::transfer()
// should not have to retrieve the VA surface underlying pixels.
// Mark this usage scenario as a fatal error and fix the code
// instead.
- log_error("GnashVaapiImage: VA surface to SW pixels are not supported\n");
+ log_error(_("GnashVaapiImage: VA surface to SW pixels are not
supported\n"));
assert(0);
_data.reset();
@@ -108,8 +108,8 @@ bool GnashVaapiImage::transfer()
image::GnashImage::iterator
GnashVaapiImage::begin()
{
- log_debug("GnashVaapiImage::data(): surface 0x%08x\n", _surface->get());
- log_debug(" -> %u usec from creation\n",
+ log_debug(_("GnashVaapiImage::data(): surface 0x%08x\n"), _surface->get());
+ log_debug(_(" -> %u usec from creation\n"),
(boost::uint32_t)(get_ticks_usec() - _creation_time));
if (!transfer()) {
@@ -123,8 +123,9 @@ GnashVaapiImage::begin()
image::GnashImage::const_iterator
GnashVaapiImage::begin() const
{
- log_debug("GnashVaapiImage::data() const: surface 0x%08x\n",
_surface->get());
- log_debug(" -> %u usec from creation\n",
+ log_debug(_("GnashVaapiImage::data() const: surface 0x%08x\n"),
+ _surface->get());
+ log_debug(_(" -> %u usec from creation\n"),
(boost::uint32_t)(get_ticks_usec() - _creation_time));
/* XXX: awful hack... */
@@ -139,5 +140,5 @@ GnashVaapiImage::begin() const
// local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/libbase/RTMP.cpp b/libbase/RTMP.cpp
index f9cba5f..880f0d9 100644
--- a/libbase/RTMP.cpp
+++ b/libbase/RTMP.cpp
@@ -202,7 +202,7 @@ RTMP::call(const SimpleBuffer& amf)
bool
RTMP::connect(const URL& url)
{
- log_debug("Connecting to %s", url.str());
+ log_debug(_("Connecting to %s"), url.str());
const std::string& hostname = url.hostname();
const std::string& p = url.port();
@@ -218,7 +218,7 @@ RTMP::connect(const URL& url)
// Basic connection attempt.
if (!_socket.connect(hostname, port)) {
- log_error("Initial connection failed");
+ log_error(_("Initial connection failed"));
return false;
}
@@ -254,7 +254,7 @@ RTMP::update()
// If we haven't finished reading a packet, retrieve it; otherwise
// use an empty one.
if (_incompletePacket.get()) {
- log_debug("Doing incomplete packet");
+ log_debug(_("Doing incomplete packet"));
p = *_incompletePacket;
_incompletePacket.reset();
}
@@ -289,7 +289,7 @@ RTMP::handlePacket(const RTMPPacket& packet)
{
const PacketType t = packet.header.packetType;
- log_debug("Received %s", t);
+ log_debug(_("Received %s"), t);
switch (t) {
@@ -321,17 +321,17 @@ RTMP::handlePacket(const RTMPPacket& packet)
break;
case PACKET_TYPE_FLEX_STREAM_SEND:
- LOG_ONCE(log_unimpl("unsupported packet %s received"));
+ LOG_ONCE(log_unimpl(_("unsupported packet received")));
break;
case PACKET_TYPE_FLEX_SHARED_OBJECT:
- LOG_ONCE(log_unimpl("unsupported packet %s received"));
+ LOG_ONCE(log_unimpl(_("unsupported packet received")));
break;
case PACKET_TYPE_FLEX_MESSAGE:
{
- LOG_ONCE(log_unimpl("partially supported packet %s received"));
- _messageQueue.push_back(packet.buffer);
+ LOG_ONCE(log_unimpl(_("partially supported packet %s received")));
+ _messageQueue.push_back(packet.buffer);
break;
}
@@ -340,7 +340,7 @@ RTMP::handlePacket(const RTMPPacket& packet)
break;
case PACKET_TYPE_SHARED_OBJECT:
- LOG_ONCE(log_unimpl("packet %s received"));
+ LOG_ONCE(log_unimpl(_("packet %s received")));
break;
case PACKET_TYPE_INVOKE:
@@ -352,7 +352,7 @@ RTMP::handlePacket(const RTMPPacket& packet)
break;
default:
- log_error("Unknown packet %s received", t);
+ log_error(_("Unknown packet %s received"), t);
}
@@ -379,7 +379,7 @@ RTMP::readSocket(boost::uint8_t* buffer, int n)
// Doesn't seem very likely to be the way the pp does it.
if (_bytesIn > _bytesInSent + _bandwidth / 2) {
sendBytesReceived(this);
- log_debug("Sent bytes received");
+ log_debug(_("Sent bytes received"));
}
buffer += bytesRead;
@@ -440,13 +440,13 @@ RTMP::readPacketHeader(RTMPPacket& packet)
return false;
}
- //log_debug("Packet is %s", boost::io::group(std::hex, (unsigned)hbuf[0]));
+ //log_debug(_("Packet is %s"), boost::io::group(std::hex,
(unsigned)hbuf[0]));
const int htype = ((hbuf[0] & 0xc0) >> 6);
- //log_debug("Thingy whatsit (packet size type): %s", htype);
+ //log_debug(_("Thingy whatsit (packet size type): %s"), htype);
const int channel = (hbuf[0] & 0x3f);
- //log_debug("Channel: %s", channel);
+ //log_debug(_("Channel: %s"), channel);
hr.headerType = static_cast<PacketSize>(htype);
hr.channel = channel;
@@ -454,7 +454,7 @@ RTMP::readPacketHeader(RTMPPacket& packet)
if (hr.channel == 0) {
if (readSocket(&hbuf[1], 1) != 1) {
- log_error("failed to read RTMP packet header 2nd byte");
+ log_error(_("failed to read RTMP packet header 2nd byte"));
return false;
}
hr.channel = hbuf[1] + 64;
@@ -462,13 +462,13 @@ RTMP::readPacketHeader(RTMPPacket& packet)
}
else if (hr.channel == 1) {
if (readSocket(&hbuf[1], 2) != 2) {
- log_error("Failed to read RTMP packet header 3nd byte");
+ log_error(_("Failed to read RTMP packet header 3nd byte"));
return false;
}
const boost::uint32_t tmp = (hbuf[2] << 8) + hbuf[1];
hr.channel = tmp + 64;
- log_debug( "%s, channel: %0x", __FUNCTION__, hr.channel);
+ log_debug(_("%s, channel: %0x"), __FUNCTION__, hr.channel);
header += 2;
}
@@ -480,7 +480,7 @@ RTMP::readPacketHeader(RTMPPacket& packet)
if (htype != RTMP_PACKET_SIZE_LARGE) {
if (!hasPacket(CHANNELS_IN, hr.channel)) {
- log_error("Incomplete packet received on channel %s", channel);
+ log_error(_("Incomplete packet received on channel %s"), channel);
return false;
}
@@ -493,7 +493,7 @@ RTMP::readPacketHeader(RTMPPacket& packet)
--nSize;
if (nSize > 0 && readSocket(header, nSize) != nSize) {
- log_error( "Failed to read RTMP packet header. type: %s",
+ log_error(_("Failed to read RTMP packet header. type: %s"),
static_cast<unsigned>(hbuf[0]));
return false;
}
@@ -538,7 +538,7 @@ RTMP::readPacketHeader(RTMPPacket& packet)
if (hr._timestamp == 0xffffff) {
if (readSocket(header+nSize, 4) != 4) {
- log_error( "%s, failed to read extended timestamp",
+ log_error(_("%s, failed to read extended timestamp"),
__FUNCTION__);
return false;
}
@@ -625,19 +625,19 @@ RTMP::sendPacket(RTMPPacket& packet)
// If this timestamp is later than the other and the difference fits
// in 3 bytes, encode a relative one.
if (uptime >= oldh._timestamp && uptime - prevTimestamp < 0xffffff) {
- //log_debug("Shrinking to medium");
+ //log_debug(_("Shrinking to medium"));
hr.headerType = RTMP_PACKET_SIZE_MEDIUM;
hr._timestamp = uptime - prevTimestamp;
// It can be still smaller if the data size is the same.
if (oldh.dataSize == hr.dataSize &&
oldh.packetType == hr.packetType) {
- //log_debug("Shrinking to small");
+ //log_debug(_("Shrinking to small"));
hr.headerType = RTMP_PACKET_SIZE_SMALL;
// If there is no timestamp difference, the minimum size
// is possible.
if (hr._timestamp == 0) {
- //log_debug("Shrinking to minimum");
+ //log_debug(_("Shrinking to minimum"));
hr.headerType = RTMP_PACKET_SIZE_MINIMUM;
}
}
@@ -780,7 +780,7 @@ RTMP::sendPacket(RTMPPacket& packet)
const boost::uint8_t* pos = payloadData(packet) + 1;
const boost::uint8_t* end = payloadEnd(packet);
const std::string& s = amf::readString(pos, end);
- log_debug( "Calling remote method %s", s);
+ log_debug(_("Calling remote method %s"), s);
}
RTMPPacket& storedpacket = storePacket(CHANNELS_OUT, hr.channel, packet);
@@ -854,7 +854,7 @@ HandShaker::call()
_stage = 3;
case 3:
if (!stage3()) return;
- log_debug("Handshake completed");
+ log_debug(_("Handshake completed"));
_complete = true;
}
}
@@ -867,13 +867,13 @@ HandShaker::stage0()
// This should probably not happen, but we can try again. An error will
// be signalled later if the socket is no longer usable.
if (!sent) {
- log_error("Stage 1 socket not ready. This should not happen.");
+ log_error(_("Stage 1 socket not ready. This should not happen."));
return false;
}
/// If we sent the wrong amount of data, we can't recover.
if (sent != sigSize + 1) {
- log_error("Could not send stage 1 data");
+ log_error(_("Could not send stage 1 data"));
_error = true;
return false;
}
@@ -895,7 +895,7 @@ HandShaker::stage1()
assert (read == sigSize + 1);
if (_recvBuf[0] != _sendBuf[0]) {
- log_error( "Type mismatch: client sent %d, server answered %d",
+ log_error(_("Type mismatch: client sent %d, server answered %d"),
_recvBuf[0], _sendBuf[0]);
}
@@ -906,8 +906,8 @@ HandShaker::stage1()
std::memcpy(&suptime, serverSig, 4);
suptime = ntohl(suptime);
- log_debug("Server Uptime : %d", suptime);
- log_debug("FMS Version : %d.%d.%d.%d",
+ log_debug(_("Server Uptime : %d"), suptime);
+ log_debug(_("FMS Version : %d.%d.%d.%d"),
+serverSig[4], +serverSig[5], +serverSig[6], +serverSig[7]);
return true;
@@ -923,7 +923,7 @@ HandShaker::stage2()
if (!sent) return false;
if (sent != sigSize) {
- log_error("Could not send complete signature.");
+ log_error(_("Could not send complete signature."));
_error = true;
return false;
}
@@ -949,7 +949,7 @@ HandShaker::stage3()
// Should we set an error here?
if (!match) {
- log_error( "Signatures do not match during handshake!");
+ log_error(_("Signatures do not match during handshake!"));
}
return true;
}
@@ -969,7 +969,7 @@ HandShaker::stage3()
bool
sendCtrl(RTMP& r, ControlType t, unsigned int nObject, unsigned int nTime)
{
- log_debug( "Sending control type %s %s", +t, t);
+ log_debug(_("Sending control type %s %s"), +t, t);
RTMPPacket packet(256);
@@ -1026,7 +1026,7 @@ handleChangeChunkSize(RTMP& r, const RTMPPacket& packet)
{
if (payloadSize(packet) >= 4) {
r._inChunkSize = amf::readNetworkLong(payloadData(packet));
- log_debug( "Changed chunk size to %d", r._inChunkSize);
+ log_debug(_("Changed chunk size to %d"), r._inChunkSize);
}
}
@@ -1037,7 +1037,7 @@ handleControl(RTMP& r, const RTMPPacket& packet)
const size_t size = payloadSize(packet);
if (size < 2) {
- log_error("Control packet too short");
+ log_error(_("Control packet too short"));
return;
}
@@ -1045,12 +1045,12 @@ handleControl(RTMP& r, const RTMPPacket& packet)
static_cast<ControlType>(amf::readNetworkShort(payloadData(packet)));
if (size < 6) {
- log_error("Control packet (%s) data too short", t);
+ log_error(_("Control packet (%s) data too short"), t);
return;
}
const int arg = amf::readNetworkLong(payloadData(packet) + 2);
- log_debug( "Received control packet %s with argument %s", t, arg);
+ log_debug(_("Received control packet %s with argument %s"), t, arg);
switch (t)
{
@@ -1067,7 +1067,7 @@ handleControl(RTMP& r, const RTMPPacket& packet)
break;
case CONTROL_RESET_STREAM:
- log_debug("Stream is recorded: %s", arg);
+ log_debug(_("Stream is recorded: %s"), arg);
break;
case CONTROL_PING:
@@ -1083,7 +1083,7 @@ handleControl(RTMP& r, const RTMPPacket& packet)
break;
default:
- log_error("Received unknown or unhandled control %s", t);
+ log_error(_("Received unknown or unhandled control %s"), t);
break;
}
@@ -1093,7 +1093,7 @@ void
handleServerBW(RTMP& r, const RTMPPacket& packet)
{
const boost::uint32_t bw = amf::readNetworkLong(payloadData(packet));
- log_debug( "Server bandwidth is %s", bw);
+ log_debug(_("Server bandwidth is %s"), bw);
r.setServerBandwidth(bw);
}
@@ -1107,7 +1107,7 @@ handleClientBW(RTMP& r, const RTMPPacket& packet)
if (payloadSize(packet) > 4) r.m_nClientBW2 = payloadData(packet)[4];
else r.m_nClientBW2 = -1;
- log_debug( "Client bandwidth is %d %d", r.bandwidth(), +r.m_nClientBW2);
+ log_debug(_("Client bandwidth is %d %d"), r.bandwidth(), +r.m_nClientBW2);
}
diff --git a/libbase/SharedMem.cpp b/libbase/SharedMem.cpp
index 822903a..150e9c5 100644
--- a/libbase/SharedMem.cpp
+++ b/libbase/SharedMem.cpp
@@ -65,14 +65,14 @@ SharedMem::~SharedMem()
if (::shmdt(_addr) < 0) {
const int err = errno;
- log_error("Error detaching shared memory: %s", std::strerror(err));
+ log_error(_("Error detaching shared memory: %s"), std::strerror(err));
}
// We can still try to shut it down.
struct ::shmid_ds ds;
if (::shmctl(_shmid, IPC_STAT, &ds) < 0) {
const int err = errno;
- log_error("Error during stat of shared memory segment: %s",
+ log_error(_("Error during stat of shared memory segment: %s"),
std::strerror(err));
}
@@ -80,8 +80,7 @@ SharedMem::~SharedMem()
else {
// Note that this isn't completely reliable.
if (!ds.shm_nattch) {
- log_debug("No shared memory users left. Removing segment "
- "and semaphore.");
+ log_debug(_("No shared memory users left. Removing segment and
semaphore."));
::shmctl(_shmid, IPC_RMID, 0);
::semctl(_semid, IPC_RMID, 0);
}
@@ -119,12 +118,11 @@ SharedMem::attach()
// Check rcfile for key; if there isn't one, use the Adobe key.
if (_shmkey == 0) {
- log_debug("No shared memory key specified in rcfile. Using default "
- "for communication with other players");
+ log_debug(_("No shared memory key specified in rcfile. Using default
for communication with other players"));
_shmkey = 0xdd3adabd;
}
- log_debug("Using shared memory key %s",
+ log_debug(_("Using shared memory key %s"),
boost::io::group(std::hex, std::showbase, _shmkey));
// First get semaphore.
@@ -149,14 +147,14 @@ SharedMem::attach()
_semid = ::semget(_shmkey, 1, IPC_CREAT | 0600);
if (_semid < 0) {
- log_error("Failed to get semaphore for shared memory!");
+ log_error(_("Failed to get semaphore for shared memory!"));
return false;
}
s.val = 1;
const int ret = ::semctl(_semid, 0, SETVAL, s);
if (ret < 0) {
- log_error("Failed to set semaphore value");
+ log_error(_("Failed to set semaphore value"));
return false;
}
}
@@ -166,8 +164,7 @@ SharedMem::attach()
const int semval = ::semctl(_semid, 0, GETVAL, s);
if (semval != 1) {
- log_error("Need semaphore value of 1 for locking. Cannot "
- "attach shared memory!");
+ log_error(_("Need semaphore value of 1 for locking. Cannot attach
shared memory!"));
return false;
}
@@ -182,14 +179,14 @@ SharedMem::attach()
}
if (_shmid < 0) {
- log_error("Unable to get shared memory segment!");
+ log_error(_("Unable to get shared memory segment!"));
return false;
}
_addr = static_cast<iterator>(::shmat(_shmid, 0, 0));
if (!_addr) {
- log_error("Unable to attach shared memory: %s",
+ log_error(_("Unable to attach shared memory: %s"),
std::strerror(errno));
return false;
}
diff --git a/libbase/Socket.cpp b/libbase/Socket.cpp
index b6153bb..8b0a4fc 100644
--- a/libbase/Socket.cpp
+++ b/libbase/Socket.cpp
@@ -74,7 +74,7 @@ Socket::connected() const
// for POSIX.
if (::getsockopt(_socket, SOL_SOCKET, SO_ERROR,
reinterpret_cast<char*>(&val), &len) < 0) {
- log_debug("Error");
+ log_debug(_("Error"));
_error = true;
return false;
}
@@ -122,7 +122,7 @@ Socket::connect(const std::string& hostname,
boost::uint16_t port)
// We use _socket here because connected() or _connected might not
// be true if a connection attempt is underway but not completed.
if (_socket) {
- log_error("Connection attempt while already connected");
+ log_error(_("Connection attempt while already connected"));
return false;
}
@@ -151,7 +151,7 @@ Socket::connect(const std::string& hostname,
boost::uint16_t port)
if (_socket < 0) {
const int err = errno;
- log_debug("Socket creation failed: %s", std::strerror(err));
+ log_debug(_("Socket creation failed: %s"), std::strerror(err));
_socket = 0;
return false;
}
@@ -168,7 +168,7 @@ Socket::connect(const std::string& hostname,
boost::uint16_t port)
const int err = errno;
#ifndef _WIN32
if (err != EINPROGRESS) {
- log_error("Failed to connect socket: %s", std::strerror(err));
+ log_error(_("Failed to connect socket: %s"), std::strerror(err));
_socket = 0;
return false;
}
@@ -184,7 +184,7 @@ Socket::connect(const std::string& hostname,
boost::uint16_t port)
// for POSIX.
if (::setsockopt(_socket, SOL_SOCKET, SO_RCVTIMEO,
reinterpret_cast<const char*>(&tv), sizeof(tv))) {
- log_error("Setting socket timeout failed");
+ log_error(_("Setting socket timeout failed"));
}
const int on = 1;
@@ -234,7 +234,7 @@ Socket::fillCache()
return;
}
#endif
- log_error("Socket receive error %s", std::strerror(err));
+ log_error(_("Socket receive error %s"), std::strerror(err));
_error = true;
return;
}
@@ -337,7 +337,7 @@ Socket::write(const void* src, std::streamsize num)
bytesSent = ::send(_socket, buf, toWrite, 0);
if (bytesSent < 0) {
const int err = errno;
- log_error("Socket send error %s", std::strerror(err));
+ log_error(_("Socket send error %s"), std::strerror(err));
_error = true;
return 0;
}
@@ -352,21 +352,21 @@ Socket::write(const void* src, std::streamsize num)
std::streampos
Socket::tell() const
{
- log_error("tell() called for Socket");
+ log_error(_("tell() called for Socket"));
return static_cast<std::streamsize>(-1);
}
bool
Socket::seek(std::streampos)
{
- log_error("seek() called for Socket");
+ log_error(_("seek() called for Socket"));
return false;
}
void
Socket::go_to_end()
{
- log_error("go_to_end() called for Socket");
+ log_error(_("go_to_end() called for Socket"));
}
bool
diff --git a/libbase/StreamProvider.cpp b/libbase/StreamProvider.cpp
index 31ee90b..f4d57be 100644
--- a/libbase/StreamProvider.cpp
+++ b/libbase/StreamProvider.cpp
@@ -109,8 +109,7 @@ StreamProvider::getStream(const URL& url, const
std::string& postdata,
if (url.protocol() == "file") {
if (!headers.empty()) {
- log_error("Request Headers discarded while getting stream "
- "from file: uri");
+ log_error(_("Request Headers discarded while getting stream from
file: uri"));
}
return getStream(url, postdata);
}
diff --git a/libbase/URLAccessManager.cpp b/libbase/URLAccessManager.cpp
index e703a2f..466ebf5 100644
--- a/libbase/URLAccessManager.cpp
+++ b/libbase/URLAccessManager.cpp
@@ -185,7 +185,7 @@ host_check(const std::string& host)
{
// GNASH_REPORT_FUNCTION;
- //log_security("Checking security of host: %s", host.c_str());
+ //log_security(_("Checking security of host: %s"), host.c_str());
assert( ! host.empty() );
@@ -259,7 +259,7 @@ bool
allowXMLSocket(const std::string& host, short port)
{
if (port < 1024) {
- log_security("Attempt to connect to disallowed port %s", port);
+ log_security(_("Attempt to connect to disallowed port %s"), port);
return false;
}
return allowHost(host);
diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index 679786c..f0d2bb5 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -235,19 +235,19 @@ CurlSession::get()
CurlSession::~CurlSession()
{
- log_debug("~CurlSession");
+ log_debug(_("~CurlSession"));
exportCookies();
CURLSHcode code;
int retries=0;
while ( (code=curl_share_cleanup(_shandle)) != CURLSHE_OK ) {
if ( ++retries > 10 ) {
- log_error("Failed cleaning up share handle: %s. Giving up after "
- "%d retries.", curl_share_strerror(code), retries);
+ log_error(_("Failed cleaning up share handle: %s. Giving up after
%d retries."),
+ curl_share_strerror(code), retries);
break;
}
- log_error("Failed cleaning up share handle: %s. Will try again in "
- "a second.", curl_share_strerror(code));
+ log_error(_("Failed cleaning up share handle: %s. Will try again in a
second."),
+ curl_share_strerror(code));
gnashSleep(1000000);
}
_shandle = 0;
@@ -321,32 +321,31 @@ CurlSession::lockSharedHandle(CURL* handle,
curl_lock_data data,
switch (data) {
case CURL_LOCK_DATA_DNS:
- //log_debug("Locking DNS cache mutex");
+ //log_debug(_("Locking DNS cache mutex"));
lock(_dnscacheMutex);
- //log_debug("DNS cache mutex locked");
+ //log_debug(_("DNS cache mutex locked"));
break;
case CURL_LOCK_DATA_COOKIE:
- //log_debug("Locking cookies mutex");
+ //log_debug(_("Locking cookies mutex"));
lock(_cookieMutex);
- //log_debug("Cookies mutex locked");
+ //log_debug(_("Cookies mutex locked"));
break;
case CURL_LOCK_DATA_SHARE:
- //log_debug("Locking share mutex");
+ //log_debug(_("Locking share mutex"));
lock(_shareMutex);
- //log_debug("Share mutex locked");
+ //log_debug(_("Share mutex locked"));
break;
case CURL_LOCK_DATA_SSL_SESSION:
- log_error("lockSharedHandle: SSL session locking "
- "unsupported");
+ log_error(_("lockSharedHandle: SSL session locking unsupported"));
break;
case CURL_LOCK_DATA_CONNECT:
- log_error("lockSharedHandle: connect locking unsupported");
+ log_error(_("lockSharedHandle: connect locking unsupported"));
break;
case CURL_LOCK_DATA_LAST:
- log_error("lockSharedHandle: last locking unsupported ?!");
+ log_error(_("lockSharedHandle: last locking unsupported ?!"));
break;
default:
- log_error("lockSharedHandle: unknown shared data %d", data);
+ log_error(_("lockSharedHandle: unknown shared data %d"), data);
break;
}
}
@@ -360,30 +359,28 @@ CurlSession::unlockSharedHandle(CURL* handle,
curl_lock_data data)
// sure that only one lock is given at any time for each kind of data.
switch (data) {
case CURL_LOCK_DATA_DNS:
- //log_debug("Unlocking DNS cache mutex");
+ //log_debug(_("Unlocking DNS cache mutex"));
unlock(_dnscacheMutex);
break;
case CURL_LOCK_DATA_COOKIE:
- //log_debug("Unlocking cookies mutex");
+ //log_debug(_("Unlocking cookies mutex"));
unlock(_cookieMutex);
break;
case CURL_LOCK_DATA_SHARE:
- //log_debug("Unlocking share mutex");
+ //log_debug(_("Unlocking share mutex"));
unlock(_shareMutex);
break;
case CURL_LOCK_DATA_SSL_SESSION:
- log_error("unlockSharedHandle: SSL session locking "
- "unsupported");
+ log_error(_("unlockSharedHandle: SSL session locking unsupported"));
break;
case CURL_LOCK_DATA_CONNECT:
- log_error("unlockSharedHandle: connect locking unsupported");
+ log_error(_("unlockSharedHandle: connect locking unsupported"));
break;
case CURL_LOCK_DATA_LAST:
- log_error("unlockSharedHandle: last locking unsupported ?!");
+ log_error(_("unlockSharedHandle: last locking unsupported ?!"));
break;
default:
- std::cerr << "unlockSharedHandle: unknown shared data " <<
- data << std::endl;
+ log_error(_("unlockSharedHandle: unknown shared data %d"), data);
break;
}
}
@@ -534,7 +531,7 @@ size_t
CurlStreamFile::recv(void *buf, size_t size, size_t nmemb, void *userp)
{
#ifdef GNASH_CURL_VERBOSE
- log_debug("curl write callback called for (%d) bytes",
+ log_debug(_("curl write callback called for (%d) bytes"),
size * nmemb);
#endif
CurlStreamFile* stream = static_cast<CurlStreamFile*>(userp);
@@ -575,7 +572,7 @@ CurlStreamFile::fillCacheNonBlocking()
{
if ( ! _running ) {
#if GNASH_CURL_VERBOSE
- log_debug("Not running: fillCacheNonBlocking returning");
+ log_debug(_("Not running: fillCacheNonBlocking returning"));
#endif
return;
}
@@ -601,15 +598,15 @@ CurlStreamFile::fillCache(std::streampos size)
{
#if GNASH_CURL_VERBOSE
- log_debug("fillCache(%d), called, currently cached: %d", size, _cached);
+ log_debug(_("fillCache(%d), called, currently cached: %d"), size, _cached);
#endif
assert(size >= 0);
if ( ! _running || _cached >= size) {
#if GNASH_CURL_VERBOSE
- if (!_running) log_debug("Not running: returning");
- else log_debug("Already enough bytes cached: returning");
+ if (!_running) log_debug(_("Not running: returning"));
+ else log_debug(_("Already enough bytes cached: returning"));
#endif
return;
}
@@ -628,7 +625,7 @@ CurlStreamFile::fillCache(std::streampos size)
RcInitFile::getDefaultInstance().getStreamsTimeout()*1000);
#ifdef GNASH_CURL_VERBOSE
- log_debug("User timeout is %u milliseconds", userTimeout);
+ log_debug(_("User timeout is %u milliseconds"), userTimeout);
#endif
WallClockTimer lastProgress; // timer since last progress
@@ -641,7 +638,7 @@ CurlStreamFile::fillCache(std::streampos size)
if (_cached >= size || !_running) break;
#if GNASH_CURL_VERBOSE
- //log_debug("cached: %d, size: %d", _cached, size);
+ //log_debug(_("cached: %d, size: %d"), _cached, size);
#endif
// Zero these out _before_ calling curl_multi_fdset!
@@ -659,13 +656,13 @@ CurlStreamFile::fillCache(std::streampos size)
}
#ifdef GNASH_CURL_VERBOSE
- log_debug("Max fd: %d", maxfd);
+ log_debug(_("Max fd: %d"), maxfd);
#endif
// A value of -1 means no file descriptors were added.
if (maxfd < 0) {
#if GNASH_CURL_VERBOSE
- log_debug("curl_multi_fdset: maxfd == %1%", maxfd);
+ log_debug(_("curl_multi_fdset: maxfd == %1%"), maxfd);
#endif
// As of libcurl 7.21.x, the DNS resolving appears to be going
// on in the background, so curl_multi_fdset fails to return
@@ -685,7 +682,7 @@ CurlStreamFile::fillCache(std::streampos size)
tv.tv_usec = maxSleepUsec;
#ifdef GNASH_CURL_VERBOSE
- log_debug("select() with %d milliseconds timeout", maxSleepUsec*1000);
+ log_debug(_("select() with %d milliseconds timeout"),
maxSleepUsec*1000);
#endif
// Wait for data on the filedescriptors until a timeout set
@@ -700,7 +697,7 @@ CurlStreamFile::fillCache(std::streampos size)
// we got interrupted by a signal
// let's consider this as a timeout
#ifdef GNASH_CURL_VERBOSE
- log_debug("select() was interrupted by a signal");
+ log_debug(_("select() was interrupted by a signal"));
#endif
ret = 0;
} else {
@@ -716,7 +713,7 @@ CurlStreamFile::fillCache(std::streampos size)
// Timeout, check the clock to see
// if we expired the user Timeout
#ifdef GNASH_CURL_VERBOSE
- log_debug("select() timed out, elapsed is %u",
+ log_debug(_("select() timed out, elapsed is %u"),
lastProgress.elapsed());
#endif
if (userTimeout && lastProgress.elapsed() > userTimeout) {
@@ -728,7 +725,7 @@ CurlStreamFile::fillCache(std::streampos size)
} else {
// Activity, reset the timer...
#ifdef GNASH_CURL_VERBOSE
- log_debug("FD activity, resetting progress timer");
+ log_debug(_("FD activity, resetting progress timer"));
#endif
lastProgress.restart();
}
@@ -763,18 +760,18 @@ CurlStreamFile::processMessages()
CURLINFO_RESPONSE_CODE, &code);
if ( code >= 400 ) {
- log_error ("HTTP response %ld from url %s",
- code, _url);
+ log_error(_("HTTP response %ld from url %s"),
+ code, _url);
_error = true;
_running = false;
} else {
- log_debug ("HTTP response %ld from url %s",
- code, _url);
+ log_debug(_("HTTP response %ld from url %s"),
+ code, _url);
}
} else {
// Transaction failed, pass on curl error.
- log_error("CURL: %s", curl_easy_strerror(
+ log_error(_("CURL: %s"), curl_easy_strerror(
curl_msg->data.result));
_error = true;
}
@@ -807,8 +804,7 @@ CurlStreamFile::init(const std::string& url, const
std::string& cachefile)
_cache = std::fopen(cachefile.c_str(), "w+b");
if (!_cache) {
- log_error("Could not open specified path as cache file. Using "
- "a temporary file instead");
+ log_error(_("Could not open specified path as cache file. Using a
temporary file instead"));
_cache = std::tmpfile();
}
} else {
@@ -816,7 +812,7 @@ CurlStreamFile::init(const std::string& url, const
std::string& cachefile)
}
if ( ! _cache ) {
- throw GnashException("Could not create temporary cache file");
+ throw GnashException(_("Could not create temporary cache file"));
}
_cachefd = fileno(_cache);
@@ -918,7 +914,7 @@ are not honored during the DNS lookup - which you can work
around by
CurlStreamFile::CurlStreamFile(const std::string& url,
const std::string& cachefile)
{
- log_debug("CurlStreamFile %p created", this);
+ log_debug(_("CurlStreamFile %p created"), this);
init(url, cachefile);
// CURLMcode ret =
@@ -932,7 +928,7 @@ CurlStreamFile::CurlStreamFile(const std::string& url,
CurlStreamFile::CurlStreamFile(const std::string& url, const std::string& vars,
const std::string& cachefile)
{
- log_debug("CurlStreamFile %p created", this);
+ log_debug(_("CurlStreamFile %p created"), this);
init(url, cachefile);
_postdata = vars;
@@ -985,7 +981,7 @@ CurlStreamFile::CurlStreamFile(const std::string& url,
const std::string& vars,
const NetworkAdapter::RequestHeaders& headers,
const std::string& cachefile)
{
- log_debug("CurlStreamFile %p created", this);
+ log_debug(_("CurlStreamFile %p created"), this);
init(url, cachefile);
_postdata = vars;
@@ -1051,7 +1047,7 @@ CurlStreamFile::CurlStreamFile(const std::string& url,
const std::string& vars,
/*public*/
CurlStreamFile::~CurlStreamFile()
{
- log_debug("CurlStreamFile %p deleted", this);
+ log_debug(_("CurlStreamFile %p deleted"), this);
curl_multi_remove_handle(_mhandle, _handle);
curl_easy_cleanup(_handle);
curl_multi_cleanup(_mhandle);
@@ -1066,14 +1062,14 @@ CurlStreamFile::read(void *dst, std::streamsize bytes)
if ( eof() || _error ) return 0;
#ifdef GNASH_CURL_VERBOSE
- log_debug ("read(%d) called", bytes);
+ log_debug(_("read(%d) called"), bytes);
#endif
fillCache(bytes + tell());
if ( _error ) return 0; // error can be set by fillCache
#ifdef GNASH_CURL_VERBOSE
- log_debug("_cache.tell = %d", tell());
+ log_debug(_("_cache.tell = %d"), tell());
#endif
return std::fread(dst, 1, bytes, _cache);
@@ -1085,7 +1081,7 @@ std::streamsize
CurlStreamFile::readNonBlocking(void *dst, std::streamsize bytes)
{
#ifdef GNASH_CURL_VERBOSE
- log_debug ("readNonBlocking(%d) called", bytes);
+ log_debug(_("readNonBlocking(%d) called"), bytes);
#endif
if ( eof() || _error ) return 0;
@@ -1093,8 +1089,7 @@ CurlStreamFile::readNonBlocking(void *dst,
std::streamsize bytes)
fillCacheNonBlocking();
if ( _error ) {
// I guess an exception would be thrown in this case ?
- log_error("curl adaptor's fillCacheNonBlocking set _error "
- "rather then throwing an exception");
+ log_error(_("curl adaptor's fillCacheNonBlocking set _error rather
then throwing an exception"));
return 0;
}
@@ -1116,7 +1111,7 @@ CurlStreamFile::eof() const
bool ret = ( ! _running && feof(_cache) );
#ifdef GNASH_CURL_VERBOSE
- log_debug("eof() returning %d", ret);
+ log_debug(_("eof() returning %d"), ret);
#endif
return ret;
@@ -1129,7 +1124,7 @@ CurlStreamFile::tell() const
std::streampos ret = std::ftell(_cache);
#ifdef GNASH_CURL_VERBOSE
- log_debug("tell() returning %ld", ret);
+ log_debug(_("tell() returning %ld"), ret);
#endif
return ret;
@@ -1150,7 +1145,7 @@ CurlStreamFile::seek(std::streampos pos)
#ifdef GNASH_CURL_WARN_SEEKSBACK
if ( pos < tell() ) {
- log_debug("Warning: seek backward requested (%ld from %ld)",
+ log_debug(_("Warning: seek backward requested (%ld from %ld)"),
pos, tell());
}
#endif
@@ -1159,13 +1154,13 @@ CurlStreamFile::seek(std::streampos pos)
if (_error) return false; // error can be set by fillCache
if (_cached < pos) {
- log_error ("Warning: could not cache enough bytes on seek: %d "
- "requested, %d cached", pos, _cached);
+ log_error(_("Warning: could not cache enough bytes on seek: %d
requested, %d cached"),
+ pos, _cached);
return false;
}
if (std::fseek(_cache, pos, SEEK_SET) == -1) {
- log_error("Warning: fseek failed");
+ log_error(_("Warning: fseek failed"));
return false;
}
@@ -1215,7 +1210,7 @@ CurlStreamFile::size() const
}
#ifdef GNASH_CURL_VERBOSE
- log_debug("get_stream_size() returning %lu", _size);
+ log_debug(_("get_stream_size() returning %lu"), _size);
#endif
return _size;
@@ -1276,7 +1271,7 @@ CurlSession::importCookies()
// there's no way to detect actual cookies import errors
// other then using curl debugging output routines
//
- log_debug("Importing cookies from file '%s'", cookiesIn);
+ log_debug(_("Importing cookies from file '%s'"), cookiesIn);
curl_easy_perform(fakeHandle);
curl_easy_cleanup(fakeHandle);
@@ -1320,7 +1315,7 @@ CurlSession::exportCookies()
}
// Cleanup, to trigger actual cookie file flushing
- log_debug("Exporting cookies file '%s'", cookiesOut);
+ log_debug(_("Exporting cookies file '%s'"), cookiesOut);
curl_easy_cleanup(fakeHandle);
}
@@ -1336,7 +1331,7 @@ std::auto_ptr<IOChannel>
NetworkAdapter::makeStream(const std::string& url, const std::string&
cachefile)
{
#ifdef GNASH_CURL_VERBOSE
- log_debug("making curl stream for %s", url);
+ log_debug(_("making curl stream for %s"), url);
#endif
std::auto_ptr<IOChannel> stream;
@@ -1345,7 +1340,7 @@ NetworkAdapter::makeStream(const std::string& url, const
std::string& cachefile)
stream.reset(new CurlStreamFile(url, cachefile));
}
catch (const std::exception& ex) {
- log_error("curl stream: %s", ex.what());
+ log_error(_("curl stream: %s"), ex.what());
}
return stream;
}
@@ -1355,7 +1350,7 @@ NetworkAdapter::makeStream(const std::string& url, const
std::string& postdata,
const std::string& cachefile)
{
#ifdef GNASH_CURL_VERBOSE
- log_debug("making curl stream for %s", url);
+ log_debug(_("making curl stream for %s"), url);
#endif
std::auto_ptr<IOChannel> stream;
@@ -1364,7 +1359,7 @@ NetworkAdapter::makeStream(const std::string& url, const
std::string& postdata,
stream.reset(new CurlStreamFile(url, postdata, cachefile));
}
catch (const std::exception& ex) {
- log_error("curl stream: %s", ex.what());
+ log_error(_("curl stream: %s"), ex.what());
}
return stream;
}
@@ -1380,7 +1375,7 @@ NetworkAdapter::makeStream(const std::string& url, const
std::string& postdata,
stream.reset(new CurlStreamFile(url, postdata, headers, cachefile));
}
catch (const std::exception& ex) {
- log_error("curl stream: %s", ex.what());
+ log_error(_("curl stream: %s"), ex.what());
}
return stream;
@@ -1430,8 +1425,7 @@ NetworkAdapter::reservedNames()
#endif // def USE_CURL
-
// Local Variables:
// mode: C++
-// indent-tabs-mode: null
+// indent-tabs-mode: nill
// End:
diff --git a/libbase/extension.cpp b/libbase/extension.cpp
index bcc00ae..412af32 100644
--- a/libbase/extension.cpp
+++ b/libbase/extension.cpp
@@ -71,7 +71,7 @@ Extension::Extension()
_pluginsdir = env;
}
- log_debug("Plugins path: %s", _pluginsdir);
+ log_debug(_("Plugins path: %s"), _pluginsdir);
#ifdef HAVE_LTDL
lt_dlsetsearchpath(_pluginsdir.c_str());
#endif
diff --git a/libbase/memory.cpp b/libbase/memory.cpp
index 921c9dd..68e2b7c 100644
--- a/libbase/memory.cpp
+++ b/libbase/memory.cpp
@@ -91,7 +91,7 @@ Memory::startStats()
// GNASH_REPORT_FUNCTION;
_collecting = true;
if (_info == 0) {
- log_debug("Allocating buffer for %d data samples", _size);
+ log_debug(_("Allocating buffer for %d data samples"), _size);
_info = new struct small_mallinfo[_size];
reset();
addStats();
@@ -298,9 +298,9 @@ Memory::analyze()
// Sanity check on our calculations
if (total_allocated != (accumulate_allocated - accumulate_freed)) {
- log_error("Calculations don't equal");
+ log_error(_("Calculations don't equal"));
} else {
- log_debug("Zero memory leaks for this program");
+ log_debug(_("Zero memory leaks for this program"));
}
if ((_checkpoint[0].uordblks != 0) && (_checkpoint[1].uordblks != 0)) {
if (_checkpoint[1].uordblks == _checkpoint[0].uordblks) {
@@ -381,5 +381,5 @@ Memory::dumpCSV()
// Local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/libbase/sharedlib.cpp b/libbase/sharedlib.cpp
index e19869e..cf751ef 100644
--- a/libbase/sharedlib.cpp
+++ b/libbase/sharedlib.cpp
@@ -66,7 +66,7 @@ SharedLib::SharedLib(const std::string& filespec)
#ifdef HAVE_LTDL
int errors = lt_dlinit ();
if (errors) {
- log_error (_("Couldn't initialize ltdl: %s"), lt_dlerror());
+ log_error(_("Couldn't initialize ltdl: %s"), lt_dlerror());
}
#else
# warning "libltdl not enabled in build".
@@ -95,13 +95,13 @@ SharedLib::openLib (const std::string& filespec)
scoped_lock lock(_libMutex);
- log_debug ("Trying to open shared library \"%s\"", filespec);
+ log_debug(_("Trying to open shared library \"%s\""), filespec);
#ifdef HAVE_LTDL
_dlhandle = lt_dlopenext (filespec.c_str());
if (_dlhandle == NULL) {
- log_error ("%s", lt_dlerror());
+ log_error("%s", lt_dlerror());
return false;
}
@@ -128,10 +128,10 @@ SharedLib::getInitEntry (const std::string& symbol)
run = lt_dlsym (_dlhandle, symbol.c_str());
if (run == NULL) {
- log_error (_("Couldn't find symbol: %s"), symbol);
+ log_error(_("Couldn't find symbol: %s"), symbol);
return NULL;
} else {
- log_debug (_("Found symbol %s @ %p"), symbol, (void *)run);
+ log_debug(_("Found symbol %s @ %p"), symbol, (void *)run);
}
#else
(void)symbol;
diff --git a/libbase/tu_file.cpp b/libbase/tu_file.cpp
index 3172bb9..f69e930 100644
--- a/libbase/tu_file.cpp
+++ b/libbase/tu_file.cpp
@@ -226,8 +226,8 @@ tu_file::size() const
struct stat statbuf;
if (fstat(fileno(_data), &statbuf) < 0)
{
- log_error("Could not fstat file");
- return static_cast<size_t>(-1);
+ log_error(_("Could not fstat file"));
+ return static_cast<size_t>(-1);
}
return statbuf.st_size;
}
diff --git a/libbase/zlib_adapter.cpp b/libbase/zlib_adapter.cpp
index 93353a7..8b6db48 100644
--- a/libbase/zlib_adapter.cpp
+++ b/libbase/zlib_adapter.cpp
@@ -138,7 +138,8 @@ InflaterIOChannel::reset()
m_at_eof = 0;
const int err = inflateReset(&m_zstream);
if (err != Z_OK) {
- log_error("inflater_impl::reset() inflateReset() returned %d", err);
+ log_error(_("inflater_impl::reset() inflateReset() returned %d"),
+ err);
m_error = 1;
return;
}
@@ -256,13 +257,13 @@ bool
InflaterIOChannel::seek(std::streampos pos)
{
if (m_error) {
- log_debug("Inflater is in error condition");
+ log_debug(_("Inflater is in error condition"));
return false;
}
// If we're seeking backwards, then restart from the beginning.
if (pos < m_logical_stream_pos) {
- log_debug("inflater reset due to seek back from %d to %d",
+ log_debug(_("inflater reset due to seek back from %d to %d"),
m_logical_stream_pos, pos );
reset();
}
@@ -280,7 +281,7 @@ InflaterIOChannel::seek(std::streampos pos)
std::streamsize bytes_read = inflate_from_stream(temp, readNow);
assert(bytes_read <= readNow);
if (bytes_read == 0) {
- log_debug("Trouble: can't seek any further.. ");
+ log_debug(_("Trouble: can't seek any further.. "));
return false;
}
}
@@ -303,7 +304,7 @@
InflaterIOChannel::InflaterIOChannel(std::auto_ptr<IOChannel> in)
const int err = inflateInit(&m_zstream);
if (err != Z_OK) {
- log_error("inflateInit() returned %d", err);
+ log_error(_("inflateInit() returned %d"), err);
m_error = 1;
return;
}
-----------------------------------------------------------------------
Summary of changes:
libbase/AMF.cpp | 14 ++--
libbase/BitsReader.h | 2 +-
libbase/ClockTime.cpp | 9 +--
libbase/GnashImage.cpp | 6 +-
libbase/GnashImageJpeg.cpp | 16 +++---
libbase/GnashImagePng.cpp | 12 ++--
libbase/GnashVaapiImage.cpp | 19 +++---
libbase/RTMP.cpp | 82 +++++++++++++-------------
libbase/SharedMem.cpp | 23 +++----
libbase/Socket.cpp | 20 +++---
libbase/StreamProvider.cpp | 3 +-
libbase/URLAccessManager.cpp | 4 +-
libbase/curl_adapter.cpp | 136 ++++++++++++++++++++----------------------
libbase/extension.cpp | 2 +-
libbase/memory.cpp | 8 +-
libbase/sharedlib.cpp | 10 ++--
libbase/tu_file.cpp | 4 +-
libbase/zlib_adapter.cpp | 11 ++--
18 files changed, 186 insertions(+), 195 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1352-g1c0cad2,
Rob Savoye <=