diff options
author | Christoph Lipka <clipka@de.adit-jv.com> | 2018-12-20 14:58:19 +0100 |
---|---|---|
committer | Christoph Lipka <clipka@de.adit-jv.com> | 2018-12-21 10:23:41 +0100 |
commit | dca8ab254aa0a687c32009079d85e4d8f960b213 (patch) | |
tree | e63b6a552fd9f61873892110a56a89ef354864cd /src/core_dump_handler/dlt_cdh_context.c | |
parent | 0d0c74640c8b792db37cb9f884f89f7561ea551f (diff) | |
download | DLT-daemon-dca8ab254aa0a687c32009079d85e4d8f960b213.tar.gz |
Code beautification using uncrustify
Signed-off-by: Christoph Lipka <clipka@de.adit-jv.com>
Diffstat (limited to 'src/core_dump_handler/dlt_cdh_context.c')
-rw-r--r-- | src/core_dump_handler/dlt_cdh_context.c | 283 |
1 files changed, 138 insertions, 145 deletions
diff --git a/src/core_dump_handler/dlt_cdh_context.c b/src/core_dump_handler/dlt_cdh_context.c index 4fb1d85..f7b8a82 100644 --- a/src/core_dump_handler/dlt_cdh_context.c +++ b/src/core_dump_handler/dlt_cdh_context.c @@ -35,21 +35,21 @@ #include "dlt_cdh.h" -// Global buffer for file reading +/* Global buffer for file reading */ char g_buffer[4096]; /* =================================================================== - ** Method : get_exec_name(...) - ** - ** Description : read executable filename - ** - ** Parameters : INPUT p_pid_str pid of the process - ** OUTPUT p_exec_name executable name - ** INPUT p_exec_name_maxsize size of p_exec_name buffer - ** - ** Returns : 0 if success, else -1 - ** ===================================================================*/ -cdh_status_t get_exec_name(unsigned int p_pid, char* p_exec_name, int p_exec_name_maxsize) +** Method : get_exec_name(...) +** +** Description : read executable filename +** +** Parameters : INPUT p_pid_str pid of the process +** OUTPUT p_exec_name executable name +** INPUT p_exec_name_maxsize size of p_exec_name buffer +** +** Returns : 0 if success, else -1 +** ===================================================================*/ +cdh_status_t get_exec_name(unsigned int p_pid, char *p_exec_name, int p_exec_name_maxsize) { char l_exe_link[CORE_MAX_FILENAME_LENGTH] = { 0 }; char *l_name_ptr = NULL; @@ -70,18 +70,18 @@ cdh_status_t get_exec_name(unsigned int p_pid, char* p_exec_name, int p_exec_nam } /* =================================================================== - ** Method : dump_file_to(...) - ** - ** Description : dump the content of file p_src_filename to the file descriptor p_fout - ** - ** Parameters : INPUT p_src_filename - ** INPUT p_fout - ** - ** Returns : 0 if success, else -1 - ** ===================================================================*/ -cdh_status_t dump_file_to(const char* p_src_filename, FILE* p_fout) +** Method : dump_file_to(...) +** +** Description : dump the content of file p_src_filename to the file descriptor p_fout +** +** Parameters : INPUT p_src_filename +** INPUT p_fout +** +** Returns : 0 if success, else -1 +** ===================================================================*/ +cdh_status_t dump_file_to(const char *p_src_filename, FILE *p_fout) { - FILE* l_fin = NULL; + FILE *l_fin = NULL; int bytes_read = 0; if (p_fout == NULL) @@ -89,32 +89,28 @@ cdh_status_t dump_file_to(const char* p_src_filename, FILE* p_fout) fprintf(p_fout, "\n==== Dumping file <%s> ====\n", p_src_filename); - if ((l_fin = fopen(p_src_filename, "rt")) == NULL) - { + if ((l_fin = fopen(p_src_filename, "rt")) == NULL) { syslog(LOG_ERR, "ERR opening info file '%s' for dumping [%s]", - p_src_filename, - strerror(errno)); + p_src_filename, + strerror(errno)); fprintf(p_fout, "**error**\n"); return CDH_NOK; } - while ((bytes_read = fread(g_buffer, 1, sizeof(g_buffer), l_fin)) != 0) - { + while ((bytes_read = fread(g_buffer, 1, sizeof(g_buffer), l_fin)) != 0) { int i = 0; - // changes all "\0" in the file to a "\n" - // (needed for example for /proc/<pid>/cmdline, to keep all arguments) + /* changes all "\0" in the file to a "\n" */ + /* (needed for example for /proc/<pid>/cmdline, to keep all arguments) */ for (i = 0; i < bytes_read; i++) - { if (g_buffer[i] == '\000') g_buffer[i] = '\n'; - } fwrite(g_buffer, 1, bytes_read, p_fout); - if (ferror(p_fout)) - { + + if (ferror(p_fout)) { syslog(LOG_ERR, "Writing in context file failed [%s]", strerror(errno)); fclose(p_fout); fclose(l_fin); @@ -124,8 +120,7 @@ cdh_status_t dump_file_to(const char* p_src_filename, FILE* p_fout) } } - if (ferror(l_fin)) - { + if (ferror(l_fin)) { syslog(LOG_ERR, "reading '%s' failed [%s]", p_src_filename, strerror(errno)); fclose(l_fin); @@ -138,42 +133,46 @@ cdh_status_t dump_file_to(const char* p_src_filename, FILE* p_fout) return CDH_OK; } -//*************************************************************************************************/ -// "ls -l" implementation for /proc/<pid>/fd (at least) -// Taken from coreutils sources, lib/filemode.c -// +/************************************************************************************************** / */ +/* "ls -l" implementation for /proc/<pid>/fd (at least) */ +/* Taken from coreutils sources, lib/filemode.c */ +/* */ /* Return a character indicating the type of file described by - file mode BITS: - '-' regular file - 'b' block special file - 'c' character special file - 'C' high performance ("contiguous data") file - 'd' directory - 'D' door - 'l' symbolic link - 'm' multiplexed file (7th edition Unix; obsolete) - 'n' network special file (HP-UX) - 'p' fifo (named pipe) - 'P' port - 's' socket - 'w' whiteout (4.4BSD) - '?' some other file type */ + * file mode BITS: + * '-' regular file + * 'b' block special file + * 'c' character special file + * 'C' high performance ("contiguous data") file + * 'd' directory + * 'D' door + * 'l' symbolic link + * 'm' multiplexed file (7th edition Unix; obsolete) + * 'n' network special file (HP-UX) + * 'p' fifo (named pipe) + * 'P' port + * 's' socket + * 'w' whiteout (4.4BSD) + * '?' some other file type */ static char ftypelet(mode_t bits) { /* These are the most common, so test for them first. */ if (S_ISREG(bits)) return '-'; + if (S_ISDIR(bits)) return 'd'; /* Other letters standardized by POSIX 1003.1-2004. */ if (S_ISBLK(bits)) return 'b'; + if (S_ISCHR(bits)) return 'c'; + if (S_ISLNK(bits)) return 'l'; + if (S_ISFIFO(bits)) return 'p'; @@ -182,18 +181,18 @@ static char ftypelet(mode_t bits) return 's'; /* Nonstandard file types. - if (S_ISCTG (bits)) - return 'C'; - if (S_ISDOOR (bits)) - return 'D'; - if (S_ISMPB (bits) || S_ISMPC (bits)) - return 'm'; - if (S_ISNWK (bits)) - return 'n'; - if (S_ISPORT (bits)) - return 'P'; - if (S_ISWHT (bits)) - return 'w'; + * if (S_ISCTG (bits)) + * return 'C'; + * if (S_ISDOOR (bits)) + * return 'D'; + * if (S_ISMPB (bits) || S_ISMPC (bits)) + * return 'm'; + * if (S_ISNWK (bits)) + * return 'n'; + * if (S_ISPORT (bits)) + * return 'P'; + * if (S_ISWHT (bits)) + * return 'w'; */ return '?'; @@ -209,49 +208,47 @@ void strmode(mode_t mode, char *str) str[2] = mode & S_IWUSR ? 'w' : '-'; str[3] = (mode & S_ISUID ? (mode & S_IXUSR ? 's' : 'S') - : - (mode & S_IXUSR ? 'x' : '-')); + : + (mode & S_IXUSR ? 'x' : '-')); str[4] = mode & S_IRGRP ? 'r' : '-'; str[5] = mode & S_IWGRP ? 'w' : '-'; str[6] = (mode & S_ISGID ? (mode & S_IXGRP ? 's' : 'S') - : - (mode & S_IXGRP ? 'x' : '-')); + : + (mode & S_IXGRP ? 'x' : '-')); str[7] = mode & S_IROTH ? 'r' : '-'; str[8] = mode & S_IWOTH ? 'w' : '-'; str[9] = (mode & S_ISVTX ? (mode & S_IXOTH ? 't' : 'T') - : - (mode & S_IXOTH ? 'x' : '-')); + : + (mode & S_IXOTH ? 'x' : '-')); str[10] = ' '; str[11] = '\0'; } /* =================================================================== - ** Method : list_dircontent_to(...) - ** - ** Description : list the filenames in p_dirname directory to the file descriptor p_fout - ** - ** Parameters : INPUT p_dirname - ** INPUT p_fout - ** - ** Returns : 0 if success, else -1 - ** ===================================================================*/ -cdh_status_t list_dircontent_to(const char* p_dirname, FILE* p_fout) +** Method : list_dircontent_to(...) +** +** Description : list the filenames in p_dirname directory to the file descriptor p_fout +** +** Parameters : INPUT p_dirname +** INPUT p_fout +** +** Returns : 0 if success, else -1 +** ===================================================================*/ +cdh_status_t list_dircontent_to(const char *p_dirname, FILE *p_fout) { - DIR* l_dd = NULL; // directory descriptor - struct dirent* l_entity = NULL; + DIR *l_dd = NULL; /* directory descriptor */ + struct dirent *l_entity = NULL; - if ((l_dd = opendir(p_dirname)) == NULL) - { + if ((l_dd = opendir(p_dirname)) == NULL) { syslog(LOG_ERR, "ERR reading info dir '%s' failed [%s]", p_dirname, strerror(errno)); return CDH_NOK; } fprintf(p_fout, "==== Listing directory <%s> ====\n", p_dirname); - while ((l_entity = readdir(l_dd)) != NULL) - { + while ((l_entity = readdir(l_dd)) != NULL) { char l_fullpath[CORE_MAX_FILENAME_LENGTH] = { 0 }; char l_linkpath[CORE_MAX_FILENAME_LENGTH] = { 0 }; char l_modebuf[12] = { 0 }; @@ -264,8 +261,7 @@ cdh_status_t list_dircontent_to(const char* p_dirname, FILE* p_fout) snprintf(l_fullpath, sizeof(l_fullpath), "%s/%s", p_dirname, l_entity->d_name); - if (lstat(l_fullpath, &l_stat) < 0) - { + if (lstat(l_fullpath, &l_stat) < 0) { syslog(LOG_ERR, "ERR lstat on '%s' failed. [%s]", l_fullpath, strerror(errno)); continue; } @@ -273,51 +269,49 @@ cdh_status_t list_dircontent_to(const char* p_dirname, FILE* p_fout) strmode(l_stat.st_mode, l_modebuf); fprintf(p_fout, "%s %ld %d %d %ld %4s", - l_modebuf, - l_stat.st_nlink, - l_stat.st_uid, - l_stat.st_gid, - l_stat.st_size, - l_entity->d_name); - - switch (l_stat.st_mode & S_IFMT) - { - case S_IFBLK: - fprintf(p_fout, " [block device]\n"); + l_modebuf, + l_stat.st_nlink, + l_stat.st_uid, + l_stat.st_gid, + l_stat.st_size, + l_entity->d_name); + + switch (l_stat.st_mode & S_IFMT) { + case S_IFBLK: + fprintf(p_fout, " [block device]\n"); break; - case S_IFCHR: - fprintf(p_fout, " [character device]\n"); + case S_IFCHR: + fprintf(p_fout, " [character device]\n"); break; - case S_IFDIR: - fprintf(p_fout, " [directory]\n"); + case S_IFDIR: + fprintf(p_fout, " [directory]\n"); break; - case S_IFIFO: - fprintf(p_fout, " [FIFO/pipe]\n"); + case S_IFIFO: + fprintf(p_fout, " [FIFO/pipe]\n"); break; - case S_IFLNK: - l_size = readlink(l_fullpath, l_linkpath, sizeof(l_linkpath)); - l_linkpath[l_size] = 0; - fprintf(p_fout, " -> %s\n", l_linkpath); + case S_IFLNK: + l_size = readlink(l_fullpath, l_linkpath, sizeof(l_linkpath)); + l_linkpath[l_size] = 0; + fprintf(p_fout, " -> %s\n", l_linkpath); break; - case S_IFREG: - fprintf(p_fout, " [regular file]\n"); + case S_IFREG: + fprintf(p_fout, " [regular file]\n"); break; - case S_IFSOCK: - fprintf(p_fout, " [socket]\n"); + case S_IFSOCK: + fprintf(p_fout, " [socket]\n"); break; - default: - fprintf(p_fout, " [unknown?]\n"); + default: + fprintf(p_fout, " [unknown?]\n"); break; } - - } // while ( (l_entity = readdir(l_dd)) != NULL ) + } /* while ( (l_entity = readdir(l_dd)) != NULL ) */ fprintf(p_fout, "===========================\n"); closedir(l_dd); @@ -325,23 +319,23 @@ cdh_status_t list_dircontent_to(const char* p_dirname, FILE* p_fout) return CDH_OK; } -//*************************************************************************************************/ -// END of "ls -l" implementation for /proc/<pid>/fd (at least) -//*************************************************************************************************/ +/************************************************************************************************** / */ +/* END of "ls -l" implementation for /proc/<pid>/fd (at least) */ +/************************************************************************************************** / */ /* =================================================================== - ** Method : write_proc_context(...) - ** - ** Description : write the context data of the crashed process - ** (context data coming mainly from /proc) - ** - ** Parameters : INPUT p_proc crashed process info - ** - ** Returns : 0 if success, else -1 - ** ===================================================================*/ -cdh_status_t write_proc_context(const proc_info_t* p_proc) +** Method : write_proc_context(...) +** +** Description : write the context data of the crashed process +** (context data coming mainly from /proc) +** +** Parameters : INPUT p_proc crashed process info +** +** Returns : 0 if success, else -1 +** ===================================================================*/ +cdh_status_t write_proc_context(const proc_info_t *p_proc) { - FILE* l_fout = NULL; + FILE *l_fout = NULL; char l_procfile[256] = { 0 }; char l_outfilename[CORE_MAX_FILENAME_LENGTH] = { 0 }; @@ -349,21 +343,20 @@ cdh_status_t write_proc_context(const proc_info_t* p_proc) return CDH_NOK; snprintf(l_outfilename, sizeof(l_outfilename), CONTEXT_FILE_PATTERN, - CORE_TMP_DIRECTORY, - p_proc->timestamp, - p_proc->name, - p_proc->pid); + CORE_TMP_DIRECTORY, + p_proc->timestamp, + p_proc->name, + p_proc->pid); - if ((l_fout = fopen(l_outfilename, "w+t")) == NULL) - { + if ((l_fout = fopen(l_outfilename, "w+t")) == NULL) { syslog(LOG_ERR, "ERR Cannot open context file '%s' [%s]", l_outfilename, strerror(errno)); return CDH_NOK; } -#define PROC_FILENAME(x) do{\ - snprintf(l_procfile, sizeof(l_procfile), "/proc/%d/"x,\ - p_proc->pid);\ -} while(0) +#define PROC_FILENAME(x) do { \ + snprintf(l_procfile, sizeof(l_procfile), "/proc/%d/"x, \ + p_proc->pid); \ +} while (0) fprintf(l_fout, "ProcName:%s\n", p_proc->name); fprintf(l_fout, "ThreadName:%s\n", p_proc->threadname); |