[mapguide-commits] r7390 - in trunk/MgDev/Web/src: ApacheAgent CgiAgent HttpHandler
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Feb 22 14:08:08 PST 2013
Author: waltweltonlair
Date: 2013-02-22 14:08:08 -0800 (Fri, 22 Feb 2013)
New Revision: 7390
Modified:
trunk/MgDev/Web/src/ApacheAgent/ApacheReaderStreamer.cpp
trunk/MgDev/Web/src/ApacheAgent/ApacheReaderStreamer.h
trunk/MgDev/Web/src/CgiAgent/CgiReaderStreamer.cpp
trunk/MgDev/Web/src/CgiAgent/CgiReaderStreamer.h
trunk/MgDev/Web/src/HttpHandler/HttpReaderStreamer.cpp
trunk/MgDev/Web/src/HttpHandler/HttpReaderStreamer.h
trunk/MgDev/Web/src/HttpHandler/HttpRequestResponseHandler.cpp
Log:
Add missing newlines to ends of files to get rid of build warnings under Linux
Modified: trunk/MgDev/Web/src/ApacheAgent/ApacheReaderStreamer.cpp
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/ApacheReaderStreamer.cpp 2013-02-22 16:42:35 UTC (rev 7389)
+++ trunk/MgDev/Web/src/ApacheAgent/ApacheReaderStreamer.cpp 2013-02-22 22:08:08 UTC (rev 7390)
@@ -1,13 +1,35 @@
+//
+// Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#include "ApacheReaderStreamer.h"
#include "http_protocol.h"
+
ApacheReaderStreamer::ApacheReaderStreamer(request_rec* rec, MgReader* reader, CREFSTRING format) :
MgHttpReaderStreamer(reader, format), m_r(rec)
{
}
-ApacheReaderStreamer::~ApacheReaderStreamer() { }
+ApacheReaderStreamer::~ApacheReaderStreamer()
+{
+}
+
+
void ApacheReaderStreamer::SetChunkedEncoding()
{
//Setting chunked to 1 enables chunked transfer encoding. No need to manually
@@ -15,8 +37,9 @@
m_r->chunked = 1;
}
+
void ApacheReaderStreamer::WriteChunk(const char* str, size_t length)
{
//Each ap_rwrite call is considered an individual chunk when m_r->chunked is set to 1
ap_rwrite(str, length, m_r);
-}
\ No newline at end of file
+}
Modified: trunk/MgDev/Web/src/ApacheAgent/ApacheReaderStreamer.h
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/ApacheReaderStreamer.h 2013-02-22 16:42:35 UTC (rev 7389)
+++ trunk/MgDev/Web/src/ApacheAgent/ApacheReaderStreamer.h 2013-02-22 22:08:08 UTC (rev 7390)
@@ -14,6 +14,7 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+
#ifndef APACHE_READER_STREAMER_H
#define APACHE_READER_STREAMER_H
@@ -21,6 +22,7 @@
#include "httpd.h"
#include "HttpHandler.h"
+
class ApacheReaderStreamer : public MgHttpReaderStreamer
{
public:
@@ -35,4 +37,4 @@
request_rec* m_r;
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/MgDev/Web/src/CgiAgent/CgiReaderStreamer.cpp
===================================================================
--- trunk/MgDev/Web/src/CgiAgent/CgiReaderStreamer.cpp 2013-02-22 16:42:35 UTC (rev 7389)
+++ trunk/MgDev/Web/src/CgiAgent/CgiReaderStreamer.cpp 2013-02-22 22:08:08 UTC (rev 7390)
@@ -1,3 +1,20 @@
+//
+// Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#include "CgiReaderStreamer.h"
#include "MapAgentStrings.h"
@@ -4,17 +21,20 @@
extern void DumpMessage(const char* format, ...);
extern void DumpMessage2(const char* msg);
+
CgiReaderStreamer::CgiReaderStreamer(MgReader* reader, CREFSTRING format) :
MgHttpReaderStreamer(reader, format),
m_bEndOfStream(false)
{
}
+
CgiReaderStreamer::~CgiReaderStreamer()
{
EndStream();
}
+
void CgiReaderStreamer::EndStream()
{
if (!m_bEndOfStream)
@@ -25,6 +45,7 @@
}
}
+
void CgiReaderStreamer::SetChunkedEncoding()
{
printf("Connection: Keep-Alive");
@@ -34,6 +55,7 @@
printf(MapAgentStrings::CrLf);
}
+
void CgiReaderStreamer::WriteChunk(const char* str, size_t length)
{
/*
@@ -63,4 +85,4 @@
//---- END chunk body ----//
printf(MapAgentStrings::CrLf);
//DumpMessage("END - CgiReaderStreamer::WriteChunk");
-}
\ No newline at end of file
+}
Modified: trunk/MgDev/Web/src/CgiAgent/CgiReaderStreamer.h
===================================================================
--- trunk/MgDev/Web/src/CgiAgent/CgiReaderStreamer.h 2013-02-22 16:42:35 UTC (rev 7389)
+++ trunk/MgDev/Web/src/CgiAgent/CgiReaderStreamer.h 2013-02-22 22:08:08 UTC (rev 7390)
@@ -38,4 +38,4 @@
std::string m_sCurrentChunk;
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/MgDev/Web/src/HttpHandler/HttpReaderStreamer.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpReaderStreamer.cpp 2013-02-22 16:42:35 UTC (rev 7389)
+++ trunk/MgDev/Web/src/HttpHandler/HttpReaderStreamer.cpp 2013-02-22 22:08:08 UTC (rev 7390)
@@ -1,28 +1,51 @@
+//
+// Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#include "HttpHandler.h"
#include "XmlJsonConvert.h"
+
MgHttpReaderStreamer::MgHttpReaderStreamer(MgReader* reader, CREFSTRING format)
{
m_reader = SAFE_ADDREF(reader);
m_format = format;
}
+
MgHttpReaderStreamer::~MgHttpReaderStreamer()
{
m_reader = NULL;
}
+
void MgHttpReaderStreamer::SetChunkedEncoding()
{
-
}
+
void MgHttpReaderStreamer::WriteChunk(const char* str, size_t length)
{
+}
+
+void MgHttpReaderStreamer::EndStream()
+{
}
-void MgHttpReaderStreamer::EndStream() { }
void MgHttpReaderStreamer::StreamResult()
{
@@ -147,8 +170,9 @@
MG_CATCH_AND_THROW(L"MgHttpReaderStreamer.StreamResult");
}
+
void MgHttpReaderStreamer::ToJson(string& xmlString, string& jsonString)
{
MgXmlJsonConvert convert;
convert.ToJson(xmlString, jsonString);
-}
\ No newline at end of file
+}
Modified: trunk/MgDev/Web/src/HttpHandler/HttpReaderStreamer.h
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpReaderStreamer.h 2013-02-22 16:42:35 UTC (rev 7389)
+++ trunk/MgDev/Web/src/HttpHandler/HttpReaderStreamer.h 2013-02-22 22:08:08 UTC (rev 7390)
@@ -14,12 +14,13 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+
#ifndef MG_HTTP_READER_STREAMER_H
#define MG_HTTP_READER_STREAMER_H
/// <summary>
-/// Purpose of this class is to provide a common base class for streaming out the contents of
-/// an MgReader instance via chunked response encoding
+/// Purpose of this class is to provide a common base class for streaming out
+/// the contents of an MgReader instance via chunked response encoding.
/// </summary>
class MG_MAPAGENT_API MgHttpReaderStreamer : public MgGuardDisposable
{
@@ -40,4 +41,4 @@
STRING m_format;
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/MgDev/Web/src/HttpHandler/HttpRequestResponseHandler.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpRequestResponseHandler.cpp 2013-02-22 16:42:35 UTC (rev 7389)
+++ trunk/MgDev/Web/src/HttpHandler/HttpRequestResponseHandler.cpp 2013-02-22 22:08:08 UTC (rev 7390)
@@ -277,4 +277,4 @@
MgXmlJsonConvert convert;
convert.ToJson(byteReader);
}
-}
\ No newline at end of file
+}
More information about the mapguide-commits
mailing list