Review request: ~200 build warning fixes to kdebase
Xander Moore
xndrcode at gmail.com
Sat Jun 5 10:34:36 BST 2010
These are pretty basic fixes, but should get rid of annoying build warnings
for kdebase.
I opened bug 240173 and attached the patch, but apparently that is not the
best way to get things reviwed and checked in.
This is mostly:
1) Initializing variables in all code paths
2) Checking return values of write() read() pipe()
3) Adding Q_UNUSED(param) for unused parameters
Thanks for reviewing and any tips.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20100605/bcfe3219/attachment.htm>
-------------- next part --------------
Index: apps/nsplugins/viewer/viewer.cpp
===================================================================
--- apps/nsplugins/viewer/viewer.cpp (revision 1132570)
+++ apps/nsplugins/viewer/viewer.cpp (working copy)
@@ -113,7 +113,10 @@
KConfigGroup cfg(&_cfg, "Misc");
int v = qBound(0, cfg.readEntry("Nice Level", 0), 19);
if (v > 0) {
- nice(v);
+ if (-1 == nice(v))
+ {
+ // Ignore: nice failed
+ }
}
v = cfg.readEntry("Max Memory", 0);
if (v > 0) {
Index: apps/kdepasswd/passwd.cpp
===================================================================
--- apps/kdepasswd/passwd.cpp (revision 1132570)
+++ apps/kdepasswd/passwd.cpp (working copy)
@@ -145,6 +145,7 @@
// Therefore, we have to start at state=2.
state=2;
+ int count = 0;
switch (state)
{
case 0:
@@ -153,8 +154,16 @@
if (isPrompt(line, "password"))
{
WaitSlave();
- write(fd(), oldpass, strlen(oldpass));
- write(fd(), "\n", 1);
+ int count = strlen(oldpass);
+ if (count != write(fd(), oldpass, count))
+ {
+ // Ignore: write failed
+ }
+
+ if (1 != write(fd(), "\n", 1))
+ {
+ // Ignore: write failed
+ }
state++;
break;
}
@@ -204,8 +213,17 @@
return 0;
}
WaitSlave();
- write(fd(), newpass, strlen(newpass));
- write(fd(), "\n", 1);
+ count = strlen(newpass);
+ if (count != write(fd(), newpass, count))
+ {
+ // Ignore: write failed
+ }
+
+ if (1 != write(fd(), "\n", 1))
+ {
+ // Ignore: write failed
+ }
+
state++;
break;
@@ -214,8 +232,16 @@
if (isPrompt(line, "re"))
{
WaitSlave();
- write(fd(), newpass, strlen(newpass));
- write(fd(), "\n", 1);
+ count = strlen(newpass);
+ if (count != write(fd(), newpass, count))
+ {
+ // Ignore: write failed
+ }
+
+ if (1 != write(fd(), "\n", 1))
+ {
+ // Ignore: write failed
+ }
state += 2;
break;
}
@@ -231,8 +257,16 @@
if (isPrompt(line, "re"))
{
WaitSlave();
- write(fd(), newpass, strlen(newpass));
- write(fd(), "\n", 1);
+ count = strlen(newpass);
+ if (count != write(fd(), newpass, count))
+ {
+ // Ignore: write failed
+ }
+
+ if (1 != write(fd(), "\n", 1))
+ {
+ // Ignore: write failed
+ }
state++;
break;
}
Index: apps/kdepasswd/kcm/chfnprocess.cpp
===================================================================
--- apps/kdepasswd/kcm/chfnprocess.cpp (revision 1132570)
+++ apps/kdepasswd/kcm/chfnprocess.cpp (working copy)
@@ -66,8 +66,16 @@
if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ )
{
WaitSlave();
- write(fd(), pass, strlen(pass));
- write(fd(), "\n", 1);
+ int count = strlen(pass);
+ if (count != write(fd(), pass, count))
+ {
+ // Ignore: write failed
+ }
+
+ if (1 != write(fd(), "\n", 1))
+ {
+ // Ignore: write failed
+ }
}
line = readLine(); // Let's see what the outcome was
Index: apps/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
===================================================================
--- apps/konqueror/shellcmdplugin/kshellcmdexecutor.cpp (revision 1132570)
+++ apps/konqueror/shellcmdplugin/kshellcmdexecutor.cpp (working copy)
@@ -125,8 +125,15 @@
if ( ok )
{
QByteArray input=str.toLocal8Bit();
- ::write(m_shellProcess->fd(),input,input.length());
- ::write(m_shellProcess->fd(),"\n",1);
+ if (::write(m_shellProcess->fd(),input,input.length()) < input.length())
+ {
+ // Ignore: Write failed.
+ }
+
+ if (::write(m_shellProcess->fd(),"\n",1) < 1)
+ {
+ // Ignore: write failed.
+ }
}
else
slotFinished();
Index: runtime/knotify/ksolidnotify.cpp
===================================================================
--- runtime/knotify/ksolidnotify.cpp (revision 1132570)
+++ runtime/knotify/ksolidnotify.cpp (working copy)
@@ -173,6 +173,8 @@
void KSolidNotify::slotServiceOwnerChanged( const QString & serviceName, const QString & oldOwner, const QString & newOwner )
{
+ Q_UNUSED(serviceName);
+
if (newOwner.isEmpty())
m_dbusServiceExists = false;
else if (oldOwner.isEmpty())
Index: runtime/kioslave/bookmarks/kio_bookmarks.cpp
===================================================================
--- runtime/kioslave/bookmarks/kio_bookmarks.cpp (revision 1132570)
+++ runtime/kioslave/bookmarks/kio_bookmarks.cpp (working copy)
@@ -204,6 +204,7 @@
extern "C" int KDE_EXPORT kdemain(int argc, char **argv)
{
+ Q_UNUSED(argc);
KAboutData about("kio_bookmarks", 0, ki18n("My bookmarks"), "0.2.2");
about.addLicense(KAboutData::License_GPL_V2);
about.addAuthor(ki18n("Xavier Vello"), ki18n("Initial developer"), "xavier.vello at gmail.com", QByteArray());
Index: runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp
===================================================================
--- runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp (revision 1132570)
+++ runtime/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp (working copy)
@@ -110,7 +110,7 @@
const QString ipAddress = upnpDevice.ipAddress();
NetDevicePrivate* d = 0;
- const NetDevice* deviceOfService;
+ const NetDevice* deviceOfService = NULL;
foreach( const NetDevice& device, deviceList )
{
const bool isSameAddress = ( device.ipAddress() == ipAddress );
Index: runtime/kioslave/network/network/builder/dnssd/dnssdnetworkbuilder.cpp
===================================================================
--- runtime/kioslave/network/network/builder/dnssd/dnssdnetworkbuilder.cpp (revision 1132570)
+++ runtime/kioslave/network/network/builder/dnssd/dnssdnetworkbuilder.cpp (working copy)
@@ -128,7 +128,7 @@
// device TODO: only search for if we can create the service?
NetDevicePrivate* d = 0;
- const NetDevice* deviceOfService;
+ const NetDevice* deviceOfService = NULL;
foreach( const NetDevice& device, deviceList )
{
const QString deviceHostName = device.hostName();
Index: runtime/kioslave/floppy/program.cpp
===================================================================
--- runtime/kioslave/floppy/program.cpp (revision 1132570)
+++ runtime/kioslave/floppy/program.cpp (working copy)
@@ -143,7 +143,11 @@
putenv(strdup("LANG=C"));
execvp(arglist[0], arglist);
//we only get here if execvp() failed
- ::write(notificationPipe[1],"failed",strlen("failed"));
+ int count = strlen("failed");
+ if (::write(notificationPipe[1],"failed",count) != count)
+ {
+ // Ignore error
+ }
::close(notificationPipe[1]);
_exit(-1);
};
Index: runtime/kioslave/man/man2html.cpp
===================================================================
--- runtime/kioslave/man/man2html.cpp (revision 1132570)
+++ runtime/kioslave/man/man2html.cpp (working copy)
@@ -2027,7 +2027,7 @@
break;
}
}
- if (*c=='.') while (*c++!='\n');
+ if (*c=='.') while (*c++!='\n') ;
*maxcol=0;
currow=layout;
while (currow) {
@@ -2068,7 +2068,7 @@
char itemsep='\t';
TABLEROW *layout=NULL, *currow;
int curfield = -1;
- while (*c++!='\n');
+ while (*c++!='\n') ;
h=c;
if (*h=='.') return c-1;
oldfont=current_font;
@@ -2085,7 +2085,7 @@
/* scan table options */
while (c<h) {
while (isspace(*c)) c++;
- for (i=0; tableopt[i] && qstrncmp(tableopt[i],c,tableoptl[i]);i++);
+ for (i=0; tableopt[i] && qstrncmp(tableopt[i],c,tableoptl[i]);i++) ;
c=c+tableoptl[i];
switch (i) {
case 0: center=1; break;
@@ -2093,8 +2093,8 @@
case 2: box=1; break;
case 3: border=1; break;
case 4: box=2; break;
- case 5: while (*c++!='('); itemsep=*c++; break;
- case 6: while (*c++!='('); linesize=0;
+ case 5: while (*c++!='(') ; itemsep=*c++; break;
+ case 6: while (*c++!='(') ; linesize=0;
while (isdigit(*c)) linesize=linesize*10+(*c++)-'0';
break;
case 7: while (*c!=')') c++;
@@ -2163,7 +2163,7 @@
}
} else if (*c=='.' && c[1]=='T' && c[2]=='&' && c[-1]=='\n') {
TABLEROW *hr;
- while (*c++!='\n');
+ while (*c++!='\n') ;
hr=currow;
currow=currow->prev;
hr->prev=NULL;
@@ -2175,7 +2175,7 @@
curfield=0;
} else if (*c=='.' && c[1]=='T' && c[2]=='E' && c[-1]=='\n') {
finished=1;
- while (*c++!='\n');
+ while (*c++!='\n') ;
if (currow->prev)
currow->prev->next=NULL;
currow->prev=NULL;
@@ -2183,7 +2183,7 @@
currow = 0;
} else if (*c=='.' && c[-1]=='\n' && !isdigit(c[1])) {
/* skip troff request inside table (usually only .sp ) */
- while (*c++!='\n');
+ while (*c++!='\n') ;
} else {
h=c;
while (*c && (*c!=itemsep || c[-1]=='\\') &&
@@ -3243,7 +3243,7 @@
while (*c && *c!='\n') c++;
c++;
h=c;
- while (*c && qstrncmp(c,".di",3)) while (*c && *c++!='\n');
+ while (*c && qstrncmp(c,".di",3)) while (*c && *c++!='\n') ;
*c='\0';
char* result=0;
scan_troff(h,0,&result);
@@ -3495,8 +3495,8 @@
while (*c && *c!='\n') c++,i++;
}
c++;
- while (*c && qstrncmp(c,endwith,i)) while (*c++!='\n');
- while (*c && *c++!='\n');
+ while (*c && qstrncmp(c,endwith,i)) while (*c++!='\n') ;
+ while (*c && *c++!='\n') ;
break;
}
case REQ_nf: // groff(7) "No Filling"
Index: runtime/soliduiserver/soliduiserver.cpp
===================================================================
--- runtime/soliduiserver/soliduiserver.cpp (revision 1132570)
+++ runtime/soliduiserver/soliduiserver.cpp (working copy)
@@ -191,6 +191,8 @@
void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appId, bool modal)
{
+ Q_UNUSED(appId);
+
// Code borrowed from kwalletd
KWindowSystem::setMainWindow(dialog, wId); // correct, set dialog parent
Index: runtime/kglobalaccel/globalshortcutsregistry.cpp
===================================================================
--- runtime/kglobalaccel/globalshortcutsregistry.cpp (revision 1132570)
+++ runtime/kglobalaccel/globalshortcutsregistry.cpp (working copy)
@@ -215,14 +215,14 @@
data.append(shortcut->friendlyName());
#ifdef Q_WS_X11
// pass X11 timestamp
- long timestamp = QX11Info::appTime();
+// long timestamp = QX11Info::appTime();
// Make sure kglobalacceld has ungrabbed the keyboard after receiving the
// keypress, otherwise actions in application that try to grab the
// keyboard (e.g. in kwin) may fail to do so. There is still a small race
// condition with this being out-of-process.
qApp->syncX();
#else
- long timestamp = 0;
+// long timestamp = 0;
#endif
// 1st Invoke the action
Index: runtime/attica/kdeplugin/kdeplatformdependent.cpp
===================================================================
--- runtime/attica/kdeplugin/kdeplatformdependent.cpp (revision 1132570)
+++ runtime/attica/kdeplugin/kdeplatformdependent.cpp (working copy)
@@ -193,6 +193,10 @@
bool Attica::KdePlatformDependent::askForCredentials(const QUrl& baseUrl, QString& user, QString& password)
{
+ Q_UNUSED(baseUrl);
+ Q_UNUSED(user);
+ Q_UNUSED(password);
+
kDebug() << "Attempting to start KCM for credentials";
KCMultiDialog KCM;
KCM.setWindowTitle( i18n( "Open Collaboration Providers" ) );
Index: runtime/kde-menu/kde-menu.cpp
===================================================================
--- runtime/kde-menu/kde-menu.cpp (revision 1132570)
+++ runtime/kde-menu/kde-menu.cpp (working copy)
@@ -153,7 +153,10 @@
qWarning("Can not talk to klauncher!");
command = KGlobal::dirs()->findExe(command);
command += ' ' + args.join(" ");
- system(command.toLocal8Bit());
+ if (system(command.toLocal8Bit()) < 0)
+ {
+ error(1, i18n("Failed to launch command."));
+ }
}
}
Index: runtime/kdesu/kdesud/kdesud.cpp
===================================================================
--- runtime/kdesu/kdesud/kdesud.cpp (revision 1132570)
+++ runtime/kdesu/kdesud/kdesud.cpp (working copy)
@@ -156,7 +156,10 @@
void sigchld_handler(int)
{
char c = ' ';
- write(pipeOfDeath[1], &c, 1);
+ if (write(pipeOfDeath[1], &c, 1) != 1)
+ {
+ // Write failed.
+ }
}
/**
@@ -310,7 +313,12 @@
repo = new Repository;
QVector<ConnectionHandler *> handler;
- pipe(pipeOfDeath);
+ if (pipe(pipeOfDeath) != 0)
+ {
+ kError(1205) << "pipe():" << ERR << "\n";
+ kdesud_cleanup();
+ exit(1);
+ }
maxfd = qMax(maxfd, pipeOfDeath[0]);
// Signal handlers
@@ -366,7 +374,10 @@
if (i == pipeOfDeath[0])
{
char buf[101];
- read(pipeOfDeath[0], buf, 100);
+ if (read(pipeOfDeath[0], buf, 100) <= 0)
+ {
+ // Ignore read failure.
+ }
pid_t result;
do
{
Index: workspace/kcheckpass/kcheckpass.c
===================================================================
--- workspace/kcheckpass/kcheckpass.c (revision 1132570)
+++ workspace/kcheckpass/kcheckpass.c (working copy)
@@ -420,7 +420,12 @@
}
lseek(lfd, 0, SEEK_SET);
- write(lfd, fcont, sprintf(fcont, "%lu\n", time(0) + THROTTLE));
+ int count = sprintf(fcont, "%lu\n", time(0) + THROTTLE);
+ if (write(lfd, fcont, count) != count)
+ {
+ message("Failed to write entire buffer.");
+ return AuthError;
+ }
close(lfd);
}
Index: workspace/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
===================================================================
--- workspace/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp (revision 1132570)
+++ workspace/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp (working copy)
@@ -973,7 +973,9 @@
bool system;
if(Misc::root())
+ {
system=true;
+ }
else
{
switch(itsGroupListView->getType())
Index: workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp
===================================================================
--- workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp (revision 1132570)
+++ workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp (working copy)
@@ -560,7 +560,9 @@
QDataStream ds(&encodedData, QIODevice::WriteOnly);
for(; it!=end; ++it)
+ {
if((*it).isValid())
+ {
if((static_cast<CFontModelItem *>((*it).internalPointer()))->isFont())
{
CFontItem *font=static_cast<CFontItem *>((*it).internalPointer());
@@ -573,7 +575,8 @@
families.insert(fam->name());
}
-
+ }
+ }
ds << families;
mimeData->setData(KFI_FONT_DRAG_MIME, encodedData);
return mimeData;
@@ -998,6 +1001,7 @@
case Qt::ToolTipRole:
if(CFontFilter::CRIT_FILENAME==itsFilterCriteria || CFontFilter::CRIT_LOCATION==itsFilterCriteria ||
CFontFilter::CRIT_FONTCONFIG==itsFilterCriteria)
+ {
if(mi->isFamily())
{
CFamilyItem *fam=static_cast<CFamilyItem *>(index.internalPointer());
@@ -1050,6 +1054,7 @@
tip+="</table></p>";
return tip;
}
+ }
break;
case Qt::FontRole:
if(COL_FONT==index.column() && mi->isSystem())
@@ -1067,6 +1072,7 @@
break;
case Qt::DisplayRole:
if(COL_FONT==index.column())
+ {
if(mi->isFamily())
{
CFamilyItem *fam=static_cast<CFamilyItem *>(index.internalPointer());
@@ -1075,6 +1081,7 @@
}
else
return (static_cast<CFontItem *>(index.internalPointer()))->style();
+ }
break;
case Qt::DecorationRole:
if(mi->isFamily())
@@ -1413,6 +1420,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem *>(realIndex.internalPointer()))->isFont())
{
CFontItem *font=static_cast<CFontItem *>(realIndex.internalPointer());
@@ -1438,6 +1446,7 @@
}
}
}
+ }
}
fontNames=CFontList::compact(fontNames);
@@ -1495,6 +1504,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem *>(realIndex.internalPointer()))->isFont())
font=static_cast<CFontItem *>(realIndex.internalPointer());
else
@@ -1502,6 +1512,7 @@
CFamilyItem *fam=static_cast<CFamilyItem *>(realIndex.internalPointer());
font=fam->regularFont();
}
+ }
}
if(font && !font->isBitmap() && font->isEnabled())
@@ -1612,7 +1623,9 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem *>(realIndex.internalPointer()))->isFamily())
+ {
switch((static_cast<CFamilyItem *>(realIndex.internalPointer()))->status())
{
case CFamilyItem::ENABLED:
@@ -1626,11 +1639,15 @@
disabled=true;
break;
}
+ }
else
+ {
if((static_cast<CFontItem *>(realIndex.internalPointer()))->isEnabled())
enabled=true;
else
disabled=true;
+ }
+ }
if(enabled && disabled)
break;
}
@@ -1700,6 +1717,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem *>(realIndex.internalPointer()))->isFont())
{
CFontItem *font=static_cast<CFontItem *>(realIndex.internalPointer());
@@ -1719,6 +1737,7 @@
}
}
else
+ {
switch((static_cast<CFamilyItem *>(realIndex.internalPointer()))->status())
{
case CFamilyItem::ENABLED:
@@ -1731,6 +1750,8 @@
en=dis=true;
break;
}
+ }
+ }
}
if(deselectList.count())
@@ -1797,6 +1818,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem *>(realIndex.internalPointer()))->isFont())
{
CFontItem *font(static_cast<CFontItem *>(realIndex.internalPointer()));
@@ -1810,6 +1832,7 @@
if(font)
fonts.insert(font);
}
+ }
}
if(fonts.count() &&
@@ -1823,7 +1846,7 @@
for(; it!=end; ++it)
{
QString file;
- int index;
+ int index = 0;
if(!(*it)->isEnabled())
{
@@ -1966,6 +1989,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem *>(realIndex.internalPointer()))->isFont())
{
if((static_cast<CFontItem *>(realIndex.internalPointer())->isEnabled()))
@@ -1974,6 +1998,7 @@
dis=true;
}
else
+ {
switch((static_cast<CFamilyItem *>(realIndex.internalPointer()))->status())
{
case CFamilyItem::ENABLED:
@@ -1986,6 +2011,8 @@
en=dis=true;
break;
}
+ }
+ }
if(en && dis)
break;
}
Index: workspace/kcontrol/kfontinst/kcmfontinst/PreviewList.h
===================================================================
--- workspace/kcontrol/kfontinst/kcmfontinst/PreviewList.h (revision 1132570)
+++ workspace/kcontrol/kfontinst/kcmfontinst/PreviewList.h (working copy)
@@ -68,8 +68,8 @@
QModelIndex index(int row, int column,
const QModelIndex &parent = QModelIndex()) const;
QModelIndex parent(const QModelIndex &index) const;
- int rowCount(const QModelIndex &parent = QModelIndex()) const { return itsItems.count(); }
- int columnCount(const QModelIndex &parent = QModelIndex()) const { return 1; }
+ int rowCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent); return itsItems.count(); }
+ int columnCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent); return 1; }
void clear();
void showFonts(const QModelIndexList &font);
Index: workspace/kcontrol/kfontinst/kcmfontinst/GroupList.cpp
===================================================================
--- workspace/kcontrol/kfontinst/kcmfontinst/GroupList.cpp (revision 1132570)
+++ workspace/kcontrol/kfontinst/kcmfontinst/GroupList.cpp (working copy)
@@ -972,6 +972,7 @@
ds >> families;
// Are we mvoeing/copying, removing a font from the current group?
if(to.isValid() && from.isValid())
+ {
if( ((static_cast<CGroupListItem *>(from.internalPointer()))->isSystem() &&
(static_cast<CGroupListItem *>(to.internalPointer()))->isPersonal()) ||
((static_cast<CGroupListItem *>(from.internalPointer()))->isPersonal() &&
@@ -982,7 +983,8 @@
emit removeFamilies(from, families);
else
emit addFamilies(to, families);
-
+ }
+
if(isUnclassified())
emit unclassifiedChanged();
}
Index: workspace/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
===================================================================
--- workspace/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp (revision 1132570)
+++ workspace/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp (working copy)
@@ -175,7 +175,7 @@
}
QTreeWidgetItem *item=0L;
- for(int i=0; item=itsView->topLevelItem(i); ++i)
+ for(int i=0; (item=itsView->topLevelItem(i)) != NULL; ++i)
item->setExpanded(true);
itsView->setSortingEnabled(true);
@@ -625,11 +625,13 @@
foreach(item, items)
{
if(item->parent() && item->isSelected())
+ {
if(isMarked(item))
haveMaked=true;
else
haveUnmarked=true;
-
+ }
+
if(haveUnmarked && haveMaked)
break;
Index: workspace/kcontrol/kfontinst/dbus/FontInst.cpp
===================================================================
--- workspace/kcontrol/kfontinst/dbus/FontInst.cpp (revision 1132570)
+++ workspace/kcontrol/kfontinst/dbus/FontInst.cpp (working copy)
@@ -505,6 +505,7 @@
theFolders[FOLDER_USER].configure();
if(sysModified)
+ {
if(isSystem)
theFolders[FOLDER_SYS].configure();
else
@@ -514,7 +515,8 @@
performAction(args);
theFolders[FOLDER_SYS].clearModified();
}
-
+ }
+
itsConnectionsTimer->start(constConnectionsTimeout);
itsFontListTimer->start(constFontListTimeout);
@@ -736,10 +738,12 @@
: Misc::hide(Misc::getFile(*ait)));
if(to!=*ait)
+ {
if((inSystem && !isSystem) || renameFontFile(*ait, to))
movedAssoc[*ait]=to;
else
result=KIO::ERR_WRITE_ACCESS_DENIED;
+ }
}
}
else
@@ -855,6 +859,7 @@
decompose(font, family, style);
if(!findFontReal(family, style, folder, fam, st))
+ {
if(updateList)
{
// Not found, so refresh font list and try again...
@@ -863,7 +868,8 @@
}
else
return false;
-
+ }
+
return true;
}
@@ -889,6 +895,7 @@
{
KFI_DBUG;
if(!findFontReal(family, style, folder, fam, st))
+ {
if(updateList)
{
// Not found, so refresh font list and try again...
@@ -897,6 +904,7 @@
}
else
return false;
+ }
return true;
}
@@ -918,7 +926,9 @@
return KIO::ERR_COULD_NOT_AUTHENTICATE;
case KAuth::ActionReply::HelperError:
KFI_DBUG << "Helper failed - error code:" << reply.errorCode();
- return (int)reply.errorCode();
+ return (int)reply.errorCode();
+ case KAuth::ActionReply::Success:
+ break;
}
KFI_DBUG << "Success!";
Index: workspace/kcontrol/input/xcursor/thememodel.cpp
===================================================================
--- workspace/kcontrol/input/xcursor/thememodel.cpp (revision 1132570)
+++ workspace/kcontrol/input/xcursor/thememodel.cpp (working copy)
@@ -314,7 +314,7 @@
bool foundCursorTheme = false;
foreach (const QString &name, theme->inherits())
- if (foundCursorTheme = isCursorTheme(name))
+ if ((foundCursorTheme = isCursorTheme(name)))
break;
if (!foundCursorTheme) {
Index: workspace/kcontrol/randr/ktimerdialog.cpp
===================================================================
--- workspace/kcontrol/randr/ktimerdialog.cpp (revision 1132570)
+++ workspace/kcontrol/randr/ktimerdialog.cpp (working copy)
@@ -216,5 +216,8 @@
case NoDefault:
slotButtonClicked(KDialog::NoDefault);
break;
+ case Reset:
+ slotButtonClicked(KDialog::Default);
+ break;
}
}
Index: workspace/kcminit/main.cpp
===================================================================
--- workspace/kcminit/main.cpp (revision 1132570)
+++ workspace/kcminit/main.cpp (working copy)
@@ -54,7 +54,10 @@
if( ready[ 1 ] == -1 )
return;
char c = 0;
- write( ready[ 1 ], &c, 1 );
+ if (1 != write( ready[ 1 ], &c, 1 ))
+ {
+ // Ignore: write failed
+ }
close( ready[ 1 ] );
ready[ 1 ] = -1;
}
@@ -63,7 +66,10 @@
{
char c = 1;
close( ready[ 1 ] );
- read( ready[ 0 ], &c, 1 );
+ if (1 != read( ready[ 0 ], &c, 1 ))
+ {
+ // Ignore: read failed
+ }
close( ready[ 0 ] );
}
@@ -245,7 +251,10 @@
// kdeinit waits for kcminit to finish, but during KDE startup
// only important kcm's are started very early in the login process,
// the rest is delayed, so fork and make parent return after the initial phase
- pipe( ready );
+ if (-1 == pipe( ready ))
+ {
+ // Ignore: pipe failed
+ }
if( fork() != 0 )
{
waitForReady();
Index: workspace/PolicyKit-kde/manager/processwatcher.cpp
===================================================================
--- workspace/PolicyKit-kde/manager/processwatcher.cpp (revision 1132570)
+++ workspace/PolicyKit-kde/manager/processwatcher.cpp (working copy)
@@ -88,7 +88,10 @@
#ifdef Q_OS_IRIX
::socketpair(AF_UNIX, SOCK_STREAM, 0, pipe);
#else
- ::pipe(deathPipe);
+ if (-1 == ::pipe(deathPipe))
+ {
+ // Ignore: pipe failed
+ }
#endif
::fcntl(deathPipe[0], F_SETFD, FD_CLOEXEC);
::fcntl(deathPipe[1], F_SETFD, FD_CLOEXEC);
@@ -142,7 +145,10 @@
// initialize the dead child pipe and make it non-blocking. in the
// extremely unlikely event that the pipe fills up, we do not under any
// circumstances want to block.
- ::pipe(deadchild_pipe);
+ if (-1 == ::pipe(deadchild_pipe))
+ {
+ // Ignore: pipe failed
+ }
::fcntl(deadchild_pipe[0], F_SETFD, FD_CLOEXEC);
::fcntl(deadchild_pipe[1], F_SETFD, FD_CLOEXEC);
::fcntl(deadchild_pipe[0], F_SETFL,
Index: workspace/solid/networkmanager-0.7/wirelessnetworkinterface.cpp
===================================================================
--- workspace/solid/networkmanager-0.7/wirelessnetworkinterface.cpp (revision 1132570)
+++ workspace/solid/networkmanager-0.7/wirelessnetworkinterface.cpp (working copy)
@@ -190,7 +190,7 @@
Solid::Control::WirelessNetworkInterface::OperationMode NMWirelessNetworkInterface::convertOperationMode(uint theirMode)
{
- Solid::Control::WirelessNetworkInterface::OperationMode ourMode;
+ Solid::Control::WirelessNetworkInterface::OperationMode ourMode = Solid::Control::WirelessNetworkInterface::Unassociated;
switch ( theirMode ) {
case NM_802_11_MODE_UNKNOWN:
ourMode = Solid::Control::WirelessNetworkInterface::Unassociated;
Index: workspace/solid/networkmanager-0.7/manager.cpp
===================================================================
--- workspace/solid/networkmanager-0.7/manager.cpp (revision 1132570)
+++ workspace/solid/networkmanager-0.7/manager.cpp (working copy)
@@ -43,6 +43,8 @@
NMNetworkManager::NMNetworkManager(QObject * parent, const QVariantList &)
{
+ Q_UNUSED(parent);
+
qDBusRegisterMetaType<QList<QDBusObjectPath> >();
d_ptr = new NMNetworkManagerPrivate;
Q_D(NMNetworkManager);
Index: workspace/solid/networkmanager-0.7/nmpropertyhelper.cpp
===================================================================
--- workspace/solid/networkmanager-0.7/nmpropertyhelper.cpp (revision 1132570)
+++ workspace/solid/networkmanager-0.7/nmpropertyhelper.cpp (working copy)
@@ -35,6 +35,9 @@
void GenericDeserializer::deserialize(const QString & propertyName, const QVariant & value, QObject * recipient)
{
+ Q_UNUSED(propertyName);
+ Q_UNUSED(value);
+ Q_UNUSED(recipient);
/*
recipient->setProperty(propertyName, value);
QMetaObject::invokeMethod(recipient, signalName);
Index: workspace/krunner/lock/lockprocess.cc
===================================================================
--- workspace/krunner/lock/lockprocess.cc (revision 1132570)
+++ workspace/krunner/lock/lockprocess.cc (working copy)
@@ -228,13 +228,19 @@
static void sigterm_handler(int)
{
char tmp = 'T';
- ::write( signal_pipe[1], &tmp, 1);
+ if (::write( signal_pipe[1], &tmp, 1) != 1)
+ {
+ // Ignore: write failed
+ }
}
static void sighup_handler(int)
{
char tmp = 'H';
- ::write( signal_pipe[1], &tmp, 1);
+ if (::write( signal_pipe[1], &tmp, 1) != 1)
+ {
+ // Ignore: write failed
+ }
}
void LockProcess::timerEvent(QTimerEvent *ev)
@@ -264,7 +270,11 @@
act.sa_handler= sighup_handler;
sigaction(SIGHUP, &act, 0L);
- pipe(signal_pipe);
+ if (-1 == pipe(signal_pipe))
+ {
+ // Ignore: pipe failed
+ }
+
QSocketNotifier* notif = new QSocketNotifier(signal_pipe[0], QSocketNotifier::Read, this);
connect( notif, SIGNAL(activated(int)), SLOT(signalPipeSignal()));
}
@@ -273,7 +283,10 @@
void LockProcess::signalPipeSignal()
{
char tmp;
- ::read( signal_pipe[0], &tmp, 1);
+ if (::read( signal_pipe[0], &tmp, 1) != 1)
+ {
+ // Ignore: read failed
+ }
if( tmp == 'T' )
quitSaver();
else if( tmp == 'H' ) {
Index: workspace/libs/kephal/service/xrandroutputs.cpp
===================================================================
--- workspace/libs/kephal/service/xrandroutputs.cpp (revision 1132570)
+++ workspace/libs/kephal/service/xrandroutputs.cpp (working copy)
@@ -163,6 +163,9 @@
}
void XRandROutput::outputChanged(RROutput id, int changes) {
+ Q_UNUSED(id);
+ Q_UNUSED(changes);
+
Q_ASSERT(id == m_rrId);
kDebug() << isConnected() << isActivated() << geom();
if (isConnected() != m_previousConnected) {
Index: workspace/libs/solid/control/networkcdmainterface.cpp
===================================================================
--- workspace/libs/solid/control/networkcdmainterface.cpp (revision 1132570)
+++ workspace/libs/solid/control/networkcdmainterface.cpp (working copy)
@@ -63,6 +63,7 @@
void Solid::Control::CdmaNetworkInterface::makeConnections(QObject * source)
{
+ Q_UNUSED(source);
}
void Solid::Control::CdmaNetworkInterfacePrivate::setBackendObject(QObject *object)
Index: workspace/libs/solid/control/networkgsminterface.cpp
===================================================================
--- workspace/libs/solid/control/networkgsminterface.cpp (revision 1132570)
+++ workspace/libs/solid/control/networkgsminterface.cpp (working copy)
@@ -64,6 +64,7 @@
void Solid::Control::GsmNetworkInterface::makeConnections(QObject * source)
{
+ Q_UNUSED(source);
}
void Solid::Control::GsmNetworkInterfacePrivate::setBackendObject(QObject *object)
Index: workspace/libs/ksysguard/processcore/processes_remote_p.cpp
===================================================================
--- workspace/libs/ksysguard/processcore/processes_remote_p.cpp (revision 1132570)
+++ workspace/libs/ksysguard/processcore/processes_remote_p.cpp (working copy)
@@ -181,6 +181,9 @@
}
bool ProcessesRemote::setScheduler(long pid, int priorityClass, int priority) {
+ Q_UNUSED(pid);
+ Q_UNUSED(priorityClass);
+ Q_UNUSED(priority);
return false;
}
Index: workspace/ksplash/ksplashx/qimage.cpp
===================================================================
--- workspace/ksplash/ksplashx/qimage.cpp (revision 1132570)
+++ workspace/ksplash/ksplashx/qimage.cpp (working copy)
@@ -6072,7 +6072,7 @@
if ( haveSamePalette(*dst,*src)
&& ( dst->depth() != 1 ||
!( (dx&7) || (sx&7) ||
- ((sw&7) && (sx+sw < src->width()) ||
+ (((sw&7) && (sx+sw < src->width())) ||
(dx+sw < dst->width()) ) ) ) )
{
// easy to copy
@@ -6091,7 +6091,7 @@
// Now assume palette can be ignored
if ( dst->depth() != src->depth() ) {
- if ( sw == src->width() && sh == src->height() || dst->depth()==32 ) {
+ if ( (sw == src->width() && sh == src->height()) || dst->depth()==32 ) {
QImage srcconv = src->convertDepth( dst->depth(), conversion_flags );
bitBlt( dst, dx, dy, &srcconv, sx, sy, sw, sh, conversion_flags );
} else {
Index: workspace/ksplash/ksplashx/pixmap.cpp
===================================================================
--- workspace/ksplash/ksplashx/pixmap.cpp (revision 1132570)
+++ workspace/ksplash/ksplashx/pixmap.cpp (working copy)
@@ -81,7 +81,7 @@
int i;
unsigned long lb;
lb = 1;
- for (i=0; ((v & lb) == 0) && i<32; i++, lb<<=1);
+ for (i=0; ((v & lb) == 0) && i<32; i++, lb<<=1) ;
return i==32 ? -1 : i;
}
Index: workspace/ksplash/ksplashx/splash.cpp
===================================================================
--- workspace/ksplash/ksplashx/splash.cpp (revision 1132570)
+++ workspace/ksplash/ksplashx/splash.cpp (working copy)
@@ -316,7 +316,10 @@
f < maxf;
++f )
close( f );
- nice( 10 );
+ if (nice( 10 ) == -1)
+ {
+ fprintf(stderr, "nice() failed");
+ }
sleep( 30 );
char* args[ 20 ];
args[ 0 ] = const_cast< char* >( "ksplashx_scale" );
@@ -569,7 +572,10 @@
{ // wait for paint being finished, and tell parent to exit
XSync( qt_xdisplay(), False );
char buf = '\0';
- write( parent_pipe, &buf, 1 );
+ if (write( parent_pipe, &buf, 1 ) != 1)
+ {
+ fprintf(stderr, "Unable to signal parent to exit.");
+ }
close( parent_pipe );
parent_pipe = -1;
}
Index: workspace/kwin/kcmkwin/kwinrules/ruleswidget.cpp
===================================================================
--- workspace/kwin/kcmkwin/kwinrules/ruleswidget.cpp (revision 1132570)
+++ workspace/kwin/kcmkwin/kwinrules/ruleswidget.cpp (working copy)
@@ -502,16 +502,16 @@
rules->types = NET::AllTypesMask;
else
{
- rules->types |= types->item(0)->isSelected() ? NET::NormalMask : 0U;
- rules->types |= types->item(1)->isSelected() ? NET::DialogMask : 0U;
- rules->types |= types->item(2)->isSelected() ? NET::UtilityMask : 0U;
- rules->types |= types->item(3)->isSelected() ? NET::DockMask : 0U;
- rules->types |= types->item(4)->isSelected() ? NET::ToolbarMask : 0U;
- rules->types |= types->item(5)->isSelected() ? NET::MenuMask : 0U;
- rules->types |= types->item(6)->isSelected() ? NET::SplashMask : 0U;
- rules->types |= types->item(7)->isSelected() ? NET::DesktopMask : 0U;
- rules->types |= types->item(8)->isSelected() ? NET::OverrideMask : 0U;
- rules->types |= types->item(9)->isSelected() ? NET::TopMenuMask : 0U;
+ rules->types |= types->item(0)->isSelected() ? NET::NormalMask : (NET::WindowTypeMask)0U;
+ rules->types |= types->item(1)->isSelected() ? NET::DialogMask : (NET::WindowTypeMask)0U;
+ rules->types |= types->item(2)->isSelected() ? NET::UtilityMask : (NET::WindowTypeMask)0U;
+ rules->types |= types->item(3)->isSelected() ? NET::DockMask : (NET::WindowTypeMask)0U;
+ rules->types |= types->item(4)->isSelected() ? NET::ToolbarMask : (NET::WindowTypeMask)0U;
+ rules->types |= types->item(5)->isSelected() ? NET::MenuMask : (NET::WindowTypeMask)0U;
+ rules->types |= types->item(6)->isSelected() ? NET::SplashMask : (NET::WindowTypeMask)0U;
+ rules->types |= types->item(7)->isSelected() ? NET::DesktopMask : (NET::WindowTypeMask)0U;
+ rules->types |= types->item(8)->isSelected() ? NET::OverrideMask : (NET::WindowTypeMask)0U;
+ rules->types |= types->item(9)->isSelected() ? NET::TopMenuMask : (NET::WindowTypeMask)0U;
}
rules->title = title->text();
rules->titlematch = static_cast< Rules::StringMatch >( title_match->currentIndex());
Index: workspace/kdm/backend/client.c
===================================================================
--- workspace/kdm/backend/client.c (revision 1132570)
+++ workspace/kdm/backend/client.c (working copy)
@@ -1757,7 +1757,10 @@
if (home && chdir( home ) < 0) {
logError( "Cannot chdir to %s's home %s: %m\n", curuser, home );
sendStr( V_MSG_ERR, "Cannot enter home directory. Using /.\n" );
- chdir( "/" );
+ if (-1 == chdir( "/" ))
+ {
+ /* Ignored */
+ }
userEnviron = setEnv( userEnviron, "HOME", "/" );
home = 0;
}
@@ -2004,12 +2007,22 @@
exit( 0 );
if (!(data = iniLoad( fname ))) {
static const int m1 = -1;
- write( pfd[1], &m1, sizeof(int) );
+ if (sizeof(int) != write( pfd[1], &m1, sizeof(int) ))
+ {
+ /* Ignore error */
+ }
exit( 0 );
}
len = strlen( data );
- write( pfd[1], &len, sizeof(int) );
- write( pfd[1], data, len + 1 );
+ if (sizeof(int) != write( pfd[1], &len, sizeof(int) ))
+ {
+ /* Ignore error */
+ }
+
+ if (len+1 != write( pfd[1], data, len + 1 ))
+ {
+ /* Ignore error */
+ }
exit( 0 );
}
close( pfd[1] );
Index: workspace/kdm/kfrontend/kdmctl.c
===================================================================
--- workspace/kdm/kfrontend/kdmctl.c (revision 1132570)
+++ workspace/kdm/kfrontend/kdmctl.c (working copy)
@@ -99,7 +99,11 @@
}
if (len == sizeof(buf) && buf[sizeof(buf) - 1] != '\n')
fprintf( stderr, "Warning: reply is too long\n" );
- fwrite( buf, 1, len, stdout );
+ if (fwrite( buf, 1, len, stdout ) != len)
+ {
+ fprintf(stderr, "Cannot write buffer to stdout.");
+ }
+
if (len == sizeof(buf) && buf[sizeof(buf) - 1] != '\n')
puts( "[...]" );
return 0;
Index: workspace/plasma/netbook/containments/sal/itemview.cpp
===================================================================
--- workspace/plasma/netbook/containments/sal/itemview.cpp (revision 1132570)
+++ workspace/plasma/netbook/containments/sal/itemview.cpp (working copy)
@@ -156,7 +156,6 @@
m_itemContainer->setCurrentItem(icon);
}
} else if (watched == m_itemContainer && event->type() == QEvent::GraphicsSceneResize) {
- QGraphicsSceneResizeEvent *re = static_cast<QGraphicsSceneResizeEvent *>(event);
ScrollBarFlags scrollBars = NoScrollBar;
if (m_itemContainer->pos().x() < 0 || m_itemContainer->geometry().right() > size().width()) {
Index: workspace/plasma/netbook/containments/common/linearappletoverlay.cpp
===================================================================
--- workspace/plasma/netbook/containments/common/linearappletoverlay.cpp (revision 1132570)
+++ workspace/plasma/netbook/containments/common/linearappletoverlay.cpp (working copy)
@@ -127,7 +127,7 @@
disconnect(m_applet, SIGNAL(destroyed()), this, SLOT(appletDestroyed()));
m_applet = 0;
- Plasma::Applet *oldApplet;
+ Plasma::Applet *oldApplet = NULL;
//FIXME: is there a way more efficient than this linear one? scene()itemAt() won't work because it would always be == this
foreach (Plasma::Applet *applet, m_containment->applets()) {
Index: workspace/plasma/desktop/containments/desktop/itemspace.cpp
===================================================================
--- workspace/plasma/desktop/containments/desktop/itemspace.cpp (revision 1132570)
+++ workspace/plasma/desktop/containments/desktop/itemspace.cpp (working copy)
@@ -466,7 +466,7 @@
// limit push to not push the item away from its preferred position
if (!(itemSpace->m_power & PushAwayFromPreferred) && item.pushBack) {
QRectF preferredGeometry = QRectF(item.preferredPosition, item.lastGeometry.size());
- qreal limit;
+ qreal limit = 0;
switch (itemSpace->m_direction) {
case DirLeft:
limit = origGeom.left() - preferredGeometry.left();
@@ -502,7 +502,7 @@
ItemSpaceItem &testItem = testGroup.m_groupItems[testItemId];
QRectF newlyTakenSpace;
- qreal push;
+ qreal push = 0;
switch (itemSpace->m_direction) {
case DirLeft:
newlyTakenSpace = QRectF(fullGeom.left() - group->m_pushAvailable, fullGeom.top(), group->m_pushAvailable, fullGeom.height());
Index: workspace/plasma/desktop/shell/panelview.cpp
===================================================================
--- workspace/plasma/desktop/shell/panelview.cpp (revision 1132570)
+++ workspace/plasma/desktop/shell/panelview.cpp (working copy)
@@ -240,6 +240,8 @@
void paintEvent(QPaintEvent* e)
{
+ Q_UNUSED(e);
+
QPainter p(this);
//p.setCompositionMode(QPainter::CompositionMode_Source);
m_shadow->paintFrame(&p);
Index: workspace/plasma/desktop/shell/plasmaapp.cpp
===================================================================
--- workspace/plasma/desktop/shell/plasmaapp.cpp (revision 1132570)
+++ workspace/plasma/desktop/shell/plasmaapp.cpp (working copy)
@@ -1215,6 +1215,7 @@
void PlasmaApp::updateActions(Plasma::ImmutabilityType immutability)
{
+ Q_UNUSED(immutability);
}
void PlasmaApp::remotePlasmoidAdded(Plasma::PackageMetadata metadata)
Index: workspace/plasma/generic/applets/icon/icon.cpp
===================================================================
--- workspace/plasma/generic/applets/icon/icon.cpp (revision 1132570)
+++ workspace/plasma/generic/applets/icon/icon.cpp (working copy)
@@ -291,7 +291,7 @@
QSizeF IconApplet::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
{
if (which == Qt::PreferredSize) {
- int iconSize;
+ int iconSize = 0;
switch (formFactor()) {
case Plasma::Planar:
Index: workspace/plasma/generic/applets/quicklaunch/icongridlayout.cpp
===================================================================
--- workspace/plasma/generic/applets/quicklaunch/icongridlayout.cpp (revision 1132570)
+++ workspace/plasma/generic/applets/quicklaunch/icongridlayout.cpp (working copy)
@@ -242,6 +242,9 @@
QSizeF IconGridLayout::sizeHint(
Qt::SizeHint which, const QSizeF &constraint) const
{
+ Q_UNUSED(which);
+ Q_UNUSED(constraint);
+
return QSizeF();
}
Index: workspace/plasma/generic/applets/notifications/ui/busywidget.cpp
===================================================================
--- workspace/plasma/generic/applets/notifications/ui/busywidget.cpp (revision 1132570)
+++ workspace/plasma/generic/applets/notifications/ui/busywidget.cpp (working copy)
@@ -177,6 +177,8 @@
void BusyWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
{
+ Q_UNUSED(event);
+
//regenerate pixmaps
m_svg->resize(contentsRect().size());
m_fadeInAnimation->setProperty("targetPixmap", m_svg->pixmap("notification-active"));
Index: workspace/plasma/generic/applets/battery/brightnessosdwidget.cpp
===================================================================
--- workspace/plasma/generic/applets/battery/brightnessosdwidget.cpp (revision 1132570)
+++ workspace/plasma/generic/applets/battery/brightnessosdwidget.cpp (working copy)
@@ -134,6 +134,7 @@
void BrightnessOSDWidget::showEvent(QShowEvent *event)
{
+ Q_UNUSED(event);
Plasma::WindowEffects::overrideShadow(winId(), true);
}
More information about the kde-core-devel
mailing list