diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2009-02-11 07:50:40 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2009-02-11 07:50:40 +0000 |
| commit | 4ed12a7c3e6e06cc6888271f79f97f5814b692f5 (patch) | |
| tree | c300cbc866333b3a9b5e50e3e0422288f4d7434f /src | |
| parent | Fix broken build (diff) | |
| download | inkscape-4ed12a7c3e6e06cc6888271f79f97f5814b692f5.tar.gz inkscape-4ed12a7c3e6e06cc6888271f79f97f5814b692f5.zip | |
Warning cleanup
(bzr r7274)
Diffstat (limited to 'src')
| -rw-r--r-- | src/dir-util.cpp | 6 | ||||
| -rw-r--r-- | src/ui/widget/object-composite-settings.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/dir-util.cpp b/src/dir-util.cpp index 75f7ca524..6beff22bf 100644 --- a/src/dir-util.cpp +++ b/src/dir-util.cpp @@ -208,8 +208,8 @@ inkscape_abs2rel (const char *path, const char *base, char *result, const size_t for (pp = path, bp = base; *pp && *bp && *pp == *bp; pp++, bp++) if (*pp == G_DIR_SEPARATOR) branch = pp; - if ((*pp == 0 || *pp == G_DIR_SEPARATOR && *(pp + 1) == 0) && - (*bp == 0 || *bp == G_DIR_SEPARATOR && *(bp + 1) == 0)) + if (((*pp == 0) || ((*pp == G_DIR_SEPARATOR) && (*(pp + 1) == 0))) && + ((*bp == 0) || ((*bp == G_DIR_SEPARATOR) && (*(bp + 1) == 0)))) { rp = result; *rp++ = '.'; @@ -220,7 +220,7 @@ inkscape_abs2rel (const char *path, const char *base, char *result, const size_t *rp = 0; goto finish; } - if (*pp == 0 && *bp == G_DIR_SEPARATOR || *pp == G_DIR_SEPARATOR && *bp == 0) + if (((*pp == 0) && (*bp == G_DIR_SEPARATOR)) || ((*pp == G_DIR_SEPARATOR) && (*bp == 0))) branch = pp; /* up to root. */ rp = result; diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index ea1e8086d..0ad7187f5 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -45,7 +45,7 @@ void ObjectCompositeSettings::_on_desktop_activate( void ObjectCompositeSettings::_on_desktop_deactivate( Inkscape::Application */*application*/, - SPDesktop *desktop, + SPDesktop */*desktop*/, ObjectCompositeSettings *w ) { if (w->_subject) { |