summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-12-10 13:10:43 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-12-10 13:10:43 +0100
commitfc2c5e2f02e6da00e27d68a83277a61efdcc9f83 (patch)
tree29578e2e041586f63d6aff5f6ec16db941ea2ef8
parent86930df464c57f84a461e4a98e5f813bff73952d (diff)
downloadabrt-fc2c5e2f02e6da00e27d68a83277a61efdcc9f83.tar.gz
abrt-fc2c5e2f02e6da00e27d68a83277a61efdcc9f83.tar.xz
abrt-fc2c5e2f02e6da00e27d68a83277a61efdcc9f83.zip
style fixes, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--lib/Plugins/Bugzilla.cpp4
-rw-r--r--lib/Plugins/FileTransfer.cpp4
-rw-r--r--lib/Plugins/TicketUploader.cpp2
-rw-r--r--lib/Utils/CrashTypesSocket.cpp4
-rw-r--r--lib/Utils/xfuncs.cpp4
-rw-r--r--src/Applet/Applet.cpp2
-rw-r--r--src/Applet/CCApplet.cpp18
-rw-r--r--src/Applet/CCApplet.h2
-rw-r--r--src/CLI/CLI.cpp2
-rw-r--r--src/Daemon/CommLayerServerSocket.cpp2
-rw-r--r--src/Daemon/Daemon.cpp2
-rw-r--r--src/Daemon/RPM.cpp2
12 files changed, 24 insertions, 24 deletions
diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp
index fecbd27..2d065f6 100644
--- a/lib/Plugins/Bugzilla.cpp
+++ b/lib/Plugins/Bugzilla.cpp
@@ -287,7 +287,7 @@ void ctx::add_attachments(const char* bug_id_str, const map_crash_report_t& pCra
if (type == CD_ATT)
{
char *encoded64 = encode_base64(content.c_str(), content.length());
- xmlrpc_value* param = xmlrpc_build_value(&env,"(s{s:s,s:s,s:s,s:s})",
+ xmlrpc_value* param = xmlrpc_build_value(&env, "(s{s:s,s:s,s:s,s:s})",
bug_id_str,
"description", ("File: " + filename).c_str(),
"filename", filename.c_str(),
@@ -483,7 +483,7 @@ void CReporterBugzilla::SetSettings(const map_plugin_settings_t& pSettings)
m_sBugzillaURL.erase(m_sBugzillaURL.length() - 1);
}
/*
- if(*(--m_sBugzillaURL.end()) == '/')
+ if (*(--m_sBugzillaURL.end()) == '/')
{
m_sBugzillaURL.erase(--m_sBugzillaURL.end());
}
diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp
index 8fff3a9..03ee464 100644
--- a/lib/Plugins/FileTransfer.cpp
+++ b/lib/Plugins/FileTransfer.cpp
@@ -114,7 +114,7 @@ now used in create_zip, but can be useful for some future
archivers as well
*/
static void traverse_directory(const char * directory, void * something,
- void (*func)(void *,const char *) )
+ void (*func)(void *, const char *) )
{
DIR * dp;
struct dirent * dirp;
@@ -225,7 +225,7 @@ static void create_tarbz2(const char * archive_name, const char * directory)
#define BLOCK_MULTIPLIER 7
name_without_bz2 = xstrdup(archive_name);
- strrchr(name_without_bz2,'.')[0] = '\0';
+ strrchr(name_without_bz2, '.')[0] = '\0';
create_tar(name_without_bz2, directory);
tarFD = open(name_without_bz2, O_RDONLY);
diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp
index 6d28131..aa6d412 100644
--- a/lib/Plugins/TicketUploader.cpp
+++ b/lib/Plugins/TicketUploader.cpp
@@ -198,7 +198,7 @@ string CTicketUploader::Report(const map_crash_report_t& pCrashReport,
}
string tmptar_name = concat_path_file(tmpdir_name, file_name.c_str());
- if (mkdir(tmptar_name.c_str(),S_IRWXU))
+ if (mkdir(tmptar_name.c_str(), S_IRWXU))
{
Error(ssprintf("Can't mkdir '%s'", tmptar_name.c_str()).c_str());
}
diff --git a/lib/Utils/CrashTypesSocket.cpp b/lib/Utils/CrashTypesSocket.cpp
index 7c206de..f16e2a9 100644
--- a/lib/Utils/CrashTypesSocket.cpp
+++ b/lib/Utils/CrashTypesSocket.cpp
@@ -73,7 +73,7 @@ std::string crash_data_to_string(const map_crash_data_t& pCrashData)
std::stringstream sCD;
map_crash_data_t::const_iterator it_cd;
sCD << "(" << pCrashData.size() << ")";
- for(it_cd = pCrashData.begin(); it_cd != pCrashData.end(); it_cd++)
+ for (it_cd = pCrashData.begin(); it_cd != pCrashData.end(); it_cd++)
{
sCD << "(" << it_cd->first.length() << ")";
sCD << it_cd->first;
@@ -150,7 +150,7 @@ map_crash_data_t string_to_crash_data(const std::string& pMessage, int& len)
sField = message.substr(ii, nSize);
message.erase(0, ii + nSize);
len += ii + nSize;
- switch(nField % 4)
+ switch (nField % 4)
{
case 0:
name = sField;
diff --git a/lib/Utils/xfuncs.cpp b/lib/Utils/xfuncs.cpp
index b1941f7..0e57639 100644
--- a/lib/Utils/xfuncs.cpp
+++ b/lib/Utils/xfuncs.cpp
@@ -8,12 +8,12 @@
/* Turn on nonblocking I/O on a fd */
int ndelay_on(int fd)
{
- return fcntl(fd, F_SETFL, fcntl(fd,F_GETFL) | O_NONBLOCK);
+ return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
}
int ndelay_off(int fd)
{
- return fcntl(fd, F_SETFL, fcntl(fd,F_GETFL) & ~O_NONBLOCK);
+ return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_NONBLOCK);
}
int close_on_exec_on(int fd)
diff --git a/src/Applet/Applet.cpp b/src/Applet/Applet.cpp
index 46278c6..1470769 100644
--- a/src/Applet/Applet.cpp
+++ b/src/Applet/Applet.cpp
@@ -135,7 +135,7 @@ static void NameOwnerChanged(DBusMessage* signal)
}
// hide icon if it's visible - as NM and don't show it, if it's not
- if(!new_owner[0])
+ if (!new_owner[0])
applet->HideIcon();
}
diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp
index e6b89d2..5d13ab8 100644
--- a/src/Applet/CCApplet.cpp
+++ b/src/Applet/CCApplet.cpp
@@ -114,7 +114,7 @@ CApplet::CApplet()
m_iAnimationStage = ICON_DEFAULT;
m_bIconsLoaded = load_icons();
/* - animation - */
- if(m_bIconsLoaded == true)
+ if (m_bIconsLoaded == true)
{
m_pStatusIcon = gtk_status_icon_new_from_pixbuf(icon_stages_buff[ICON_DEFAULT]);
}
@@ -244,7 +244,7 @@ void CApplet::ShowIcon()
{
gtk_status_icon_set_visible(m_pStatusIcon, true);
/* only animate if all icons are loaded, use the "gtk-warning" instead */
- if(m_bIconsLoaded)
+ if (m_bIconsLoaded)
animate_icon();
}
@@ -300,13 +300,13 @@ void CApplet::Enable(const char *reason)
gboolean CApplet::update_icon(void *user_data)
{
CApplet* applet = (CApplet*)user_data;
- if(applet->m_pStatusIcon && applet->m_iAnimationStage < ICON_STAGE_LAST){
+ if (applet->m_pStatusIcon && applet->m_iAnimationStage < ICON_STAGE_LAST) {
gtk_status_icon_set_from_pixbuf(applet->m_pStatusIcon,
applet->icon_stages_buff[applet->m_iAnimationStage++]);
}
else
error_msg("icon is null");
- if(applet->m_iAnimationStage == ICON_STAGE_LAST){
+ if (applet->m_iAnimationStage == ICON_STAGE_LAST) {
applet->m_iAnimationStage = 0;
}
if (--applet->m_iAnimCountdown == 0) {
@@ -317,7 +317,7 @@ gboolean CApplet::update_icon(void *user_data)
void CApplet::animate_icon()
{
- if(m_iAnimator == 0)
+ if (m_iAnimator == 0)
{
m_iAnimator = g_timeout_add(100, update_icon, this);
m_iAnimCountdown = 10 * 60; /* 60 sec */
@@ -327,7 +327,7 @@ void CApplet::animate_icon()
void CApplet::stop_animate_icon()
{
/* animator should be 0 if icons are not loaded, so this should be safe */
- if(m_iAnimator != 0){
+ if (m_iAnimator != 0) {
g_source_remove(m_iAnimator);
gtk_status_icon_set_from_pixbuf(m_pStatusIcon, icon_stages_buff[ICON_DEFAULT]);
m_iAnimator = 0;
@@ -337,13 +337,13 @@ void CApplet::stop_animate_icon()
bool CApplet::load_icons()
{
int stage;
- for(stage = ICON_DEFAULT; stage < ICON_STAGE_LAST; stage++)
+ for (stage = ICON_DEFAULT; stage < ICON_STAGE_LAST; stage++)
{
char name[sizeof(ICON_DIR"/abrt%02d.png")];
GError *error = NULL;
- if(snprintf(name, sizeof(ICON_DIR"/abrt%02d.png"),ICON_DIR"/abrt%02d.png", stage) > 0){
+ if (snprintf(name, sizeof(ICON_DIR"/abrt%02d.png"), ICON_DIR"/abrt%02d.png", stage) > 0) {
icon_stages_buff[stage] = gdk_pixbuf_new_from_file(name, &error);
- if(error != NULL){
+ if (error != NULL) {
error_msg("Can't load pixbuf from %s, animation is disabled!", name);
return false;
}
diff --git a/src/Applet/CCApplet.h b/src/Applet/CCApplet.h
index 15ac2f7..48dbabc 100644
--- a/src/Applet/CCApplet.h
+++ b/src/Applet/CCApplet.h
@@ -77,7 +77,7 @@ class CApplet
protected:
//@@TODO applet menus
- static void OnAppletActivate_CB(GtkStatusIcon *status_icon,gpointer user_data);
+ static void OnAppletActivate_CB(GtkStatusIcon *status_icon, gpointer user_data);
static void OnMenuPopup_cb(GtkStatusIcon *status_icon,
guint button,
guint activate_time,
diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp
index 9f2db3f..ac686ba 100644
--- a/src/CLI/CLI.cpp
+++ b/src/CLI/CLI.cpp
@@ -131,7 +131,7 @@ int main(int argc, char** argv)
char* uuid = NULL;
int op = -1;
- setlocale(LC_ALL,"");
+ setlocale(LC_ALL, "");
#if ENABLE_NLS
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
diff --git a/src/Daemon/CommLayerServerSocket.cpp b/src/Daemon/CommLayerServerSocket.cpp
index 80dabb7..0c5f2e3 100644
--- a/src/Daemon/CommLayerServerSocket.cpp
+++ b/src/Daemon/CommLayerServerSocket.cpp
@@ -219,7 +219,7 @@ vector_crash_infos_t CCommLayerServerSocket::GetCrashInfos(const std::string &pS
}
//reimplement as CreateReportThread(...)?
-//map_crash_report_t CCommLayerServerSocket::CreateReport(const std::string &pUUID,const std::string &pSender)
+//map_crash_report_t CCommLayerServerSocket::CreateReport(const std::string &pUUID, const std::string &pSender)
//{
// map_crash_report_t crashReport;
// crashReport = ::CreateReport(pUUID, pSender);
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 1fa324f..3f88230 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -667,7 +667,7 @@ int main(int argc, char** argv)
int opt;
int parent_pid = getpid();
- setlocale(LC_ALL,"");
+ setlocale(LC_ALL, "");
#if ENABLE_NLS
bindtextdomain(PACKAGE, LOCALEDIR);
diff --git a/src/Daemon/RPM.cpp b/src/Daemon/RPM.cpp
index 4a819b5..b3cf2c1 100644
--- a/src/Daemon/RPM.cpp
+++ b/src/Daemon/RPM.cpp
@@ -146,7 +146,7 @@ std::string GetComponent(const char* pFileName)
if (header != NULL)
{
rpmtd td = rpmtdNew();
- headerGet(header,RPMTAG_SOURCERPM, td, HEADERGET_DEFAULT);
+ headerGet(header, RPMTAG_SOURCERPM, td, HEADERGET_DEFAULT);
const char * srpm = rpmtdGetString(td);
if (srpm != NULL)
{