openmamba/distromatic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code updates to current gcc

Browse Source
This commit is contained in:
Silvan 2023-08-16 13:00:04 +02:00
parent d744c16571
commit 2536192624
12 changed files with 13 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1,7 +1,7 @@
project(distromatic)
cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR) cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)
project(distromatic)
set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale") set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
if (NOT SYSCONF_INSTALL_DIR) if (NOT SYSCONF_INSTALL_DIR)

2
src/backend-sqlite3.c
View File

@ -17,7 +17,9 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <string.h>
#include <sqlite3.h> #include <sqlite3.h>
#include <linux/limits.h>
#include "headerlist.h" #include "headerlist.h"
#include "changelog.h" #include "changelog.h"
#include "backend-sqlite3.h" #include "backend-sqlite3.h"

9
src/buildtools.c
View File

@ -18,16 +18,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/ */
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
#include <string.h> #include <string.h>
#endif
#if HAVE_STRINGS_H
# include <strings.h>
#endif
#include <linux/limits.h> #include <linux/limits.h>
#include "distromatic.h" #include "distromatic.h"

21
src/changelog.c
View File

@ -18,27 +18,6 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/ */
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
#if HAVE_STRINGS_H
# include <strings.h>
#endif
#include <string.h> #include <string.h>
#include "distromatic.h" #include "distromatic.h"

33
src/distromatic.c
View File

@ -35,42 +35,9 @@
#include <signal.h> #include <signal.h>
#include <assert.h> #include <assert.h>
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
/* Tell glibc's <string.h> to provide a prototype for strndup() */
# ifndef __USE_GNU
# define __USE_GNU
# endif
#include <string.h> #include <string.h>
#endif
#if HAVE_STRINGS_H
# include <strings.h>
#endif
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#if !HAVE_STRCHR
# define strchr index
#endif
#include "buildtools.h" #include "buildtools.h"
#include "changelog.h" #include "changelog.h"

40
src/distroquery.c
View File

@ -28,50 +28,12 @@
#include <locale.h> #include <locale.h>
#define _(x) gettext(x) #define _(x) gettext(x)
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <ctype.h> #include <ctype.h>
#include <malloc.h> #include <malloc.h>
#include <string.h> #include <string.h>
#include <linux/limits.h>
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
/* Tell glibc's <string.h> to provide a prototype for strndup() */
# ifndef __USE_GNU
# define __USE_GNU
# endif
# include <string.h>
#endif
#if HAVE_STRINGS_H
# include <strings.h>
#endif
/* Tell glibc's <time.h> to provide a prototype for strptime() */
#ifndef __USE_XOPEN
# define __USE_XOPEN
#endif
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#if !HAVE_STRCHR
# define strchr index
#endif
#include <sqlite3.h> #include <sqlite3.h>
#include "distromatic.h" #include "distromatic.h"
#include "config.h" #include "config.h"

35
src/functions.c
View File

@ -18,50 +18,17 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/ */
#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
# if HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <dirent.h> #include <dirent.h>
#include <libiberty/libiberty.h> #include <libiberty/libiberty.h>
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
#if HAVE_STRINGS_H
# include <strings.h>
#endif
#ifdef HAVE_LIBIBERTY_H
# include <libiberty.h>
#endif
/* Tell glibc's <time.h> to provide a prototype for strptime() */ /* Tell glibc's <time.h> to provide a prototype for strptime() */
#ifndef __USE_XOPEN #ifndef __USE_XOPEN
# define __USE_XOPEN # define __USE_XOPEN
#endif #endif
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#include "distromatic.h" #include "distromatic.h"
#include "config.h" #include "config.h"
#include "functions.h" #include "functions.h"

21
src/headerlist.c
View File

@ -35,25 +35,6 @@
#define rpmReadPackageFile(a,b,c,d) rpmReadPackageHeader(b,d,0,NULL,NULL) #define rpmReadPackageFile(a,b,c,d) rpmReadPackageHeader(b,d,0,NULL,NULL)
#endif #endif
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
#if HAVE_STRINGS_H
# include <strings.h>
#endif
#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
# if HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
#include "distromatic.h" #include "distromatic.h"
#include "config.h" #include "config.h"
#include "changelog.h" #include "changelog.h"
@ -277,7 +258,7 @@ generateHeaderStats(struct configTag *ct, int arch)
stats->headerlistvec[arch] = stats->headerlistvec[arch] =
malloc(sizeof(struct headerList *) * stats->headercount[arch]); malloc(sizeof(struct headerList *) * stats->headercount[arch]);
if (!stats->headerlistvec) { if (!stats->headerlistvec[arch]) {
return 1; return 1;
} }

11
src/include/changelog.h
View File

@ -8,17 +8,6 @@
#ifndef CHANGELOG_H #ifndef CHANGELOG_H
#define CHANGELOG_H #define CHANGELOG_H
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#include "distromatic.h" #include "distromatic.h"
#include "config.h" #include "config.h"
#include "rpmfunctions.h" #include "rpmfunctions.h"

9
src/reports.c
View File

@ -18,15 +18,8 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/ */
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
#include <string.h> #include <string.h>
#endif #include <linux/limits.h>
#if HAVE_STRINGS_H
# include <strings.h>
#endif
#include "distromatic.h" #include "distromatic.h"
#include "changelog.h" #include "changelog.h"

18
src/requirelist.c
View File

@ -18,26 +18,8 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/ */
#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
# if HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
#include <stdio.h> #include <stdio.h>
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
#include <string.h> #include <string.h>
#endif
#if HAVE_STRINGS_H
# include <strings.h>
#endif
#ifndef HEADERLIST_H #ifndef HEADERLIST_H
# include "headerlist.h" # include "headerlist.h"

9
src/rpmfunctions.c
View File

@ -18,16 +18,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/ */
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
#include <string.h> #include <string.h>
#endif
#if HAVE_STRINGS_H
# include <strings.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <zlib.h> #include <zlib.h>