summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2008-05-30 20:15:16 +0000
committerishmal <ishmal@users.sourceforge.net>2008-05-30 20:15:16 +0000
commit9d1f7f5ed31a44ee6ab2600e2d70dec68c0407a9 (patch)
treee71fcfd586fe751c3781b327cd3615a71aa5ef90 /src
parentAlvin Penner's fix for bug 235861 (diff)
downloadinkscape-9d1f7f5ed31a44ee6ab2600e2d70dec68c0407a9.tar.gz
inkscape-9d1f7f5ed31a44ee6ab2600e2d70dec68c0407a9.zip
remove warnings
(bzr r5765)
Diffstat (limited to 'src')
-rw-r--r--src/dom/io/socket.cpp86
-rw-r--r--src/dom/odf/odfdocument.cpp6
-rw-r--r--src/dom/xmlwriter.cpp4
-rw-r--r--src/dom/xmlwriter.h4
-rw-r--r--src/dom/xpathimpl.cpp28
-rw-r--r--src/dom/xpathtoken.cpp124
6 files changed, 126 insertions, 126 deletions
diff --git a/src/dom/io/socket.cpp b/src/dom/io/socket.cpp
index 22b03b8b3..b800d7453 100644
--- a/src/dom/io/socket.cpp
+++ b/src/dom/io/socket.cpp
@@ -10,7 +10,7 @@
* Authors:
* Bob Jamison
*
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2008 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -207,15 +207,15 @@ void TcpSocket::init()
WSAStartup( wVersionRequested, &wsaData );
#endif
#ifdef HAVE_SSL
- if (libssl_is_present)
- {
+ if (libssl_is_present)
+ {
sslStream = NULL;
sslContext = NULL;
- CRYPTO_set_locking_callback(cryptoLockCallback);
+ CRYPTO_set_locking_callback(cryptoLockCallback);
CRYPTO_set_id_callback(cryptoIdCallback);
SSL_library_init();
SSL_load_error_strings();
- }
+ }
#endif
tcp_socket_inited = true;
}
@@ -471,10 +471,10 @@ long TcpSocket::available()
if (count<=0 && sslEnabled)
{
#ifdef HAVE_SSL
- if (libssl_is_present)
- {
+ if (libssl_is_present)
+ {
return SSL_pending(sslStream);
- }
+ }
#endif
}
return count;
@@ -494,19 +494,19 @@ bool TcpSocket::write(int ch)
if (sslEnabled)
{
#ifdef HAVE_SSL
- if (libssl_is_present)
- {
- int r = SSL_write(sslStream, &c, 1);
- if (r<=0)
+ if (libssl_is_present)
{
- switch(SSL_get_error(sslStream, r))
+ int r = SSL_write(sslStream, &c, 1);
+ if (r<=0)
{
- default:
+ switch(SSL_get_error(sslStream, r))
+ {
+ default:
printf("SSL write problem");
return -1;
+ }
}
}
- }
#endif
}
else
@@ -535,19 +535,19 @@ bool TcpSocket::write(const DOMString &strArg)
if (sslEnabled)
{
#ifdef HAVE_SSL
- if (libssl_is_present)
- {
- int r = SSL_write(sslStream, (unsigned char *)str.c_str(), len);
- if (r<=0)
+ if (libssl_is_present)
{
- switch(SSL_get_error(sslStream, r))
+ int r = SSL_write(sslStream, (unsigned char *)str.c_str(), len);
+ if (r<=0)
{
- default:
- printf("SSL write problem");
- return -1;
+ switch(SSL_get_error(sslStream, r))
+ {
+ default:
+ printf("SSL write problem");
+ return -1;
+ }
}
}
- }
#endif
}
else
@@ -592,28 +592,28 @@ int TcpSocket::read()
if (sslEnabled)
{
#ifdef HAVE_SSL
- if (libssl_is_present)
- {
- if (!sslStream)
- return -1;
- int r = SSL_read(sslStream, &ch, 1);
- unsigned long err = SSL_get_error(sslStream, r);
- switch (err)
+ if (libssl_is_present)
{
- case SSL_ERROR_NONE:
- break;
- case SSL_ERROR_ZERO_RETURN:
- return -1;
- case SSL_ERROR_SYSCALL:
- printf("SSL read problem(syscall) %s\n",
- ERR_error_string(ERR_get_error(), NULL));
- return -1;
- default:
- printf("SSL read problem %s\n",
- ERR_error_string(ERR_get_error(), NULL));
+ if (!sslStream)
return -1;
+ int r = SSL_read(sslStream, &ch, 1);
+ unsigned long err = SSL_get_error(sslStream, r);
+ switch (err)
+ {
+ case SSL_ERROR_NONE:
+ break;
+ case SSL_ERROR_ZERO_RETURN:
+ return -1;
+ case SSL_ERROR_SYSCALL:
+ printf("SSL read problem(syscall) %s\n",
+ ERR_error_string(ERR_get_error(), NULL));
+ return -1;
+ default:
+ printf("SSL read problem %s\n",
+ ERR_error_string(ERR_get_error(), NULL));
+ return -1;
+ }
}
- }
#endif
}
else
diff --git a/src/dom/odf/odfdocument.cpp b/src/dom/odf/odfdocument.cpp
index 6e3645ceb..c3bb5d97d 100644
--- a/src/dom/odf/odfdocument.cpp
+++ b/src/dom/odf/odfdocument.cpp
@@ -5,7 +5,7 @@
*
* ---------------------------------------------------------------------
*
- * Copyright (C) 2006 Bob Jamison
+ * Copyright (C) 2006-2008 Bob Jamison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -135,7 +135,7 @@ OdfDocument::~OdfDocument()
/**
*
*/
-bool OdfDocument::readFile(const std::string &fileName)
+bool OdfDocument::readFile(const std::string &/*fileName*/)
{
return true;
}
@@ -143,7 +143,7 @@ bool OdfDocument::readFile(const std::string &fileName)
/**
*
*/
-bool OdfDocument::writeFile(const std::string &fileName)
+bool OdfDocument::writeFile(const std::string &/*fileName*/)
{
return true;
}
diff --git a/src/dom/xmlwriter.cpp b/src/dom/xmlwriter.cpp
index 13fe76e5a..2b056cf9f 100644
--- a/src/dom/xmlwriter.cpp
+++ b/src/dom/xmlwriter.cpp
@@ -10,7 +10,7 @@
* Authors:
* Bob Jamison
*
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2008 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -62,7 +62,7 @@ void XmlWriter::spaces()
/**
*
*/
-void XmlWriter::po(char *fmt, ...)
+void XmlWriter::po(const char *fmt, ...)
{
char str[257];
va_list args;
diff --git a/src/dom/xmlwriter.h b/src/dom/xmlwriter.h
index 925dacd51..cd787993c 100644
--- a/src/dom/xmlwriter.h
+++ b/src/dom/xmlwriter.h
@@ -13,7 +13,7 @@
* Authors:
* Bob Jamison
*
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2008 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -65,7 +65,7 @@ protected:
void spaces();
- void po(char *str, ...) G_GNUC_PRINTF(2,3);
+ void po(const char *str, ...) G_GNUC_PRINTF(2,3);
void pos(const DOMString &str);
diff --git a/src/dom/xpathimpl.cpp b/src/dom/xpathimpl.cpp
index 0af7b11e5..b7aa2c1c8 100644
--- a/src/dom/xpathimpl.cpp
+++ b/src/dom/xpathimpl.cpp
@@ -10,7 +10,7 @@
* Authors:
* Bob Jamison
*
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2008 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -49,8 +49,8 @@ namespace xpath
*
*/
XPathExpression *XPathEvaluatorImpl::createExpression(
- const DOMString &expression,
- const XPathNSResolver *resolver)
+ const DOMString &/*expression*/,
+ const XPathNSResolver */*resolver*/)
throw (XPathException, dom::DOMException)
{
return NULL;
@@ -60,7 +60,7 @@ XPathExpression *XPathEvaluatorImpl::createExpression(
/**
*
*/
-XPathNSResolver *XPathEvaluatorImpl::createNSResolver(const Node *nodeResolver)
+XPathNSResolver *XPathEvaluatorImpl::createNSResolver(const Node */*nodeResolver*/)
{
return NULL;
}
@@ -70,11 +70,11 @@ XPathNSResolver *XPathEvaluatorImpl::createNSResolver(const Node *nodeResolver)
*
*/
XPathResult *XPathEvaluatorImpl::evaluate(
- const DOMString &expression,
- const Node *contextNode,
- const XPathNSResolver *resolver,
- const unsigned short type,
- const XPathResult *result)
+ const DOMString &/*expression*/,
+ const Node */*contextNode*/,
+ const XPathNSResolver */*resolver*/,
+ const unsigned short /*type*/,
+ const XPathResult */*result*/)
throw (XPathException, dom::DOMException)
{
return NULL;
@@ -97,9 +97,9 @@ XPathResult *XPathEvaluatorImpl::evaluate(
*
*/
XPathResult *XPathExpressionImpl::evaluate(
- const Node *contextNode,
- unsigned short type,
- const XPathResult *result)
+ const Node */*contextNode*/,
+ unsigned short /*type*/,
+ const XPathResult */*result*/)
throw (XPathException, dom::DOMException)
{
return NULL;
@@ -115,7 +115,7 @@ XPathResult *XPathExpressionImpl::evaluate(
/**
*
*/
-DOMString XPathNSResolverImpl::lookupNamespaceURI(const DOMString &prefix)
+DOMString XPathNSResolverImpl::lookupNamespaceURI(const DOMString &/*prefix*/)
{
return "";
}
@@ -197,7 +197,7 @@ Node *XPathResultImpl::iterateNext() throw (XPathException, dom::DOMException)
/**
*
*/
-Node *XPathResultImpl::snapshotItem(unsigned long index) throw (XPathException)
+Node *XPathResultImpl::snapshotItem(unsigned long /*index*/) throw (XPathException)
{
return NULL;
}
diff --git a/src/dom/xpathtoken.cpp b/src/dom/xpathtoken.cpp
index fe906f4f8..921cbf044 100644
--- a/src/dom/xpathtoken.cpp
+++ b/src/dom/xpathtoken.cpp
@@ -10,7 +10,7 @@
* Authors:
* Bob Jamison
*
- * Copyright (C) 2006 Bob Jamison
+ * Copyright (C) 2006-2008 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -88,7 +88,7 @@ static bool tokInt(Token &tok, Stack &stack)
return true;
}
-static bool tokAnd(Token &tok, Stack &stack)
+static bool tokAnd(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -97,7 +97,7 @@ static bool tokAnd(Token &tok, Stack &stack)
return true;
}
-static bool tokOr(Token &tok, Stack &stack)
+static bool tokOr(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -106,7 +106,7 @@ static bool tokOr(Token &tok, Stack &stack)
return true;
}
-static bool tokMod(Token &tok, Stack &stack)
+static bool tokMod(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -116,7 +116,7 @@ static bool tokMod(Token &tok, Stack &stack)
}
-static bool tokDiv(Token &tok, Stack &stack)
+static bool tokDiv(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -125,7 +125,7 @@ static bool tokDiv(Token &tok, Stack &stack)
return true;
}
-static bool tokMul(Token &tok, Stack &stack)
+static bool tokMul(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -134,7 +134,7 @@ static bool tokMul(Token &tok, Stack &stack)
return true;
}
-static bool tokPlus(Token &tok, Stack &stack)
+static bool tokPlus(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -143,7 +143,7 @@ static bool tokPlus(Token &tok, Stack &stack)
return true;
}
-static bool tokMinus(Token &tok, Stack &stack)
+static bool tokMinus(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -153,7 +153,7 @@ static bool tokMinus(Token &tok, Stack &stack)
}
-static bool tokNeg(Token &tok, Stack &stack)
+static bool tokNeg(Token &/*tok*/, Stack &stack)
{
StackItem item = stack.pop();
item.dval = -item.dval;
@@ -163,7 +163,7 @@ static bool tokNeg(Token &tok, Stack &stack)
}
-static bool tokEquals(Token &tok, Stack &stack)
+static bool tokEquals(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -173,7 +173,7 @@ static bool tokEquals(Token &tok, Stack &stack)
}
-static bool tokNotEquals(Token &tok, Stack &stack)
+static bool tokNotEquals(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -183,7 +183,7 @@ static bool tokNotEquals(Token &tok, Stack &stack)
}
-static bool tokLessThan(Token &tok, Stack &stack)
+static bool tokLessThan(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -193,7 +193,7 @@ static bool tokLessThan(Token &tok, Stack &stack)
}
-static bool tokLessThanEquals(Token &tok, Stack &stack)
+static bool tokLessThanEquals(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -203,7 +203,7 @@ static bool tokLessThanEquals(Token &tok, Stack &stack)
}
-static bool tokGreaterThanEquals(Token &tok, Stack &stack)
+static bool tokGreaterThanEquals(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -213,7 +213,7 @@ static bool tokGreaterThanEquals(Token &tok, Stack &stack)
}
-static bool tokGreaterThan(Token &tok, Stack &stack)
+static bool tokGreaterThan(Token &/*tok*/, Stack &stack)
{
StackItem item1 = stack.pop();
StackItem item2 = stack.pop();
@@ -231,32 +231,32 @@ static bool tokGreaterThan(Token &tok, Stack &stack)
//# X P A T H I T E M S
//###########################
-static bool tokAbsolute(Token &tok, Stack &stack)
+static bool tokAbsolute(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokRelative(Token &tok, Stack &stack)
+static bool tokRelative(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokStep(Token &tok, Stack &stack)
+static bool tokStep(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokNameTest(Token &tok, Stack &stack)
+static bool tokNameTest(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokExpr(Token &tok, Stack &stack)
+static bool tokExpr(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokUnion(Token &tok, Stack &stack)
+static bool tokUnion(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
@@ -269,79 +269,79 @@ static bool tokUnion(Token &tok, Stack &stack)
//###########################
-static bool tokAxisAncestorOrSelf(Token &tok, Stack &stack)
+static bool tokAxisAncestorOrSelf(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisAncestor(Token &tok, Stack &stack)
+static bool tokAxisAncestor(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisAttribute(Token &tok, Stack &stack)
+static bool tokAxisAttribute(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisChild(Token &tok, Stack &stack)
+static bool tokAxisChild(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisDescendantOrSelf(Token &tok, Stack &stack)
+static bool tokAxisDescendantOrSelf(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisDescendant(Token &tok, Stack &stack)
+static bool tokAxisDescendant(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisFollowingSibling(Token &tok, Stack &stack)
+static bool tokAxisFollowingSibling(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisFollowing(Token &tok, Stack &stack)
+static bool tokAxisFollowing(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisNamespace(Token &tok, Stack &stack)
+static bool tokAxisNamespace(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisParent(Token &tok, Stack &stack)
+static bool tokAxisParent(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisPrecedingSibling(Token &tok, Stack &stack)
+static bool tokAxisPrecedingSibling(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisPreceding(Token &tok, Stack &stack)
+static bool tokAxisPreceding(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokAxisSelf(Token &tok, Stack &stack)
+static bool tokAxisSelf(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
@@ -353,163 +353,163 @@ static bool tokAxisSelf(Token &tok, Stack &stack)
//###########################
-static bool tokFuncLast(Token &tok, Stack &stack)
+static bool tokFuncLast(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncPosition(Token &tok, Stack &stack)
+static bool tokFuncPosition(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncCount(Token &tok, Stack &stack)
+static bool tokFuncCount(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncId(Token &tok, Stack &stack)
+static bool tokFuncId(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncLocalName(Token &tok, Stack &stack)
+static bool tokFuncLocalName(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncNamespaceUri(Token &tok, Stack &stack)
+static bool tokFuncNamespaceUri(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncName(Token &tok, Stack &stack)
+static bool tokFuncName(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncString(Token &tok, Stack &stack)
+static bool tokFuncString(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncConcat(Token &tok, Stack &stack)
+static bool tokFuncConcat(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncStartsWith(Token &tok, Stack &stack)
+static bool tokFuncStartsWith(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncContains(Token &tok, Stack &stack)
+static bool tokFuncContains(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncSubstringBefore(Token &tok, Stack &stack)
+static bool tokFuncSubstringBefore(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncSubstringAfter(Token &tok, Stack &stack)
+static bool tokFuncSubstringAfter(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncSubstring(Token &tok, Stack &stack)
+static bool tokFuncSubstring(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncStringLength(Token &tok, Stack &stack)
+static bool tokFuncStringLength(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncNormalizeSpace(Token &tok, Stack &stack)
+static bool tokFuncNormalizeSpace(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncTranslate(Token &tok, Stack &stack)
+static bool tokFuncTranslate(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncBoolean(Token &tok, Stack &stack)
+static bool tokFuncBoolean(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncNot(Token &tok, Stack &stack)
+static bool tokFuncNot(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncTrue(Token &tok, Stack &stack)
+static bool tokFuncTrue(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncFalse(Token &tok, Stack &stack)
+static bool tokFuncFalse(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncLang(Token &tok, Stack &stack)
+static bool tokFuncLang(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncNumber(Token &tok, Stack &stack)
+static bool tokFuncNumber(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncSum(Token &tok, Stack &stack)
+static bool tokFuncSum(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncFloor(Token &tok, Stack &stack)
+static bool tokFuncFloor(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncCeiling(Token &tok, Stack &stack)
+static bool tokFuncCeiling(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
-static bool tokFuncRound(Token &tok, Stack &stack)
+static bool tokFuncRound(Token &/*tok*/, Stack &/*stack*/)
{
return true;
}
@@ -987,7 +987,7 @@ void TokenExecutor::reset()
*/
int TokenExecutor::execute(std::vector<Token> &tokens,
int position,
- const NodePtr node,
+ const NodePtr /*node*/,
NodeList &result)
{
Stack stack(*this);