diff options
| author | Karel Klic <kklic@redhat.com> | 2009-11-19 10:14:27 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2009-11-19 10:14:27 +0100 |
| commit | bd60681c8227bc31ef0991e98a9a3e849032c924 (patch) | |
| tree | 5d4f3cf03d54ecb30ab863c7cc349bfcd232346c /src/CLI | |
| parent | 0ecc573a8ba79bca8e37809c41f92f0b629149e8 (diff) | |
| parent | 83aea71df4761ec10c0d947055e65102bcace489 (diff) | |
| download | abrt-bd60681c8227bc31ef0991e98a9a3e849032c924.tar.gz abrt-bd60681c8227bc31ef0991e98a9a3e849032c924.tar.xz abrt-bd60681c8227bc31ef0991e98a9a3e849032c924.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src/CLI')
| -rw-r--r-- | src/CLI/CLI.cpp | 14 | ||||
| -rw-r--r-- | src/CLI/Makefile.am | 12 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp index edc8df00..9f2db3f0 100644 --- a/src/CLI/CLI.cpp +++ b/src/CLI/CLI.cpp @@ -17,7 +17,6 @@ */ #include <getopt.h> #include "ABRTException.h" -#include "ABRTSocket.h" #include "abrtlib.h" #include "abrt_dbus.h" #include "DBusCommon.h" @@ -99,20 +98,19 @@ static const struct option longopts[] = }; /* Gets the program name from the first command line argument. */ -static char *progname(char *argv0) +static const char *progname(const char *argv0) { - char* name = strrchr(argv0, '/'); + const char* name = strrchr(argv0, '/'); if (name) return ++name; - else - return argv0; + return argv0; } /* Prints abrt-cli version and some help text. */ static void usage(char *argv0) { - char *name = progname(argv0); - printf("%s " VERSION "\n\n", name); + const char *name = progname(argv0); + printf("%s "VERSION"\n\n", name); /* Message has embedded tabs. */ printf(_("Usage: %s [OPTION]\n\n" @@ -167,7 +165,7 @@ int main(int argc, char** argv) return 1; case 'V': case OPT_VERSION: - printf("%s " VERSION "\n", progname(argv[0])); + printf("%s "VERSION"\n", progname(argv[0])); return 0; } if (c == -1) diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am index dbeb1c38..e84d426a 100644 --- a/src/CLI/Makefile.am +++ b/src/CLI/Makefile.am @@ -1,15 +1,11 @@ bin_PROGRAMS = abrt-cli +# removed: ABRTSocket.h ABRTSocket.cpp abrt_cli_SOURCES = \ CLI.cpp \ - ABRTSocket.h \ - ABRTSocket.cpp \ - run-command.h \ - run-command.cpp \ - report.h \ - report.cpp \ - dbus.h \ - dbus.cpp + run-command.h run-command.cpp \ + report.h report.cpp \ + dbus.h dbus.cpp abrt_cli_CPPFLAGS = \ -I$(srcdir)/../../inc \ |