sort.c (goaccess-1.6.5) | : | sort.c (goaccess-1.7) | ||
---|---|---|---|---|
skipping to change at line 82 | skipping to change at line 82 | |||
{SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | {SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | |||
/* STATUS_CODES */ | /* STATUS_CODES */ | |||
{SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | {SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | |||
/* REMOTE_USER */ | /* REMOTE_USER */ | |||
{SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | {SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | |||
/* CACHE_STATUS */ | /* CACHE_STATUS */ | |||
{SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | {SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | |||
#ifdef HAVE_GEOLOCATION | #ifdef HAVE_GEOLOCATION | |||
/* GEO_LOCATION */ | /* GEO_LOCATION */ | |||
{SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | {SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT _BY_CUMTS, SORT_BY_MAXTS, -1}, | |||
/* ASN */ | ||||
{SORT_BY_HITS, SORT_BY_VISITORS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT | ||||
_BY_CUMTS, SORT_BY_MAXTS, -1}, | ||||
#endif | #endif | |||
/* MIME_TYPE */ | /* MIME_TYPE */ | |||
{SORT_BY_HITS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT_BY_CUMTS, SORT_BY _MAXTS, -1}, | {SORT_BY_HITS, SORT_BY_DATA, SORT_BY_BW, SORT_BY_AVGTS, SORT_BY_CUMTS, SORT_BY _MAXTS, -1}, | |||
/* TLS_TYPE */ | /* TLS_TYPE */ | |||
{SORT_BY_HITS, SORT_BY_DATA, SORT_BY_VISITORS, SORT_BY_BW, -1}, | {SORT_BY_HITS, SORT_BY_DATA, SORT_BY_VISITORS, SORT_BY_BW, -1}, | |||
}; | }; | |||
static GEnum FIELD[] = { | static GEnum FIELD[] = { | |||
{"BY_HITS" , SORT_BY_HITS } , | {"BY_HITS" , SORT_BY_HITS } , | |||
{"BY_VISITORS" , SORT_BY_VISITORS } , | {"BY_VISITORS" , SORT_BY_VISITORS } , | |||
skipping to change at line 124 | skipping to change at line 126 | |||
{VISIT_TIMES , SORT_BY_DATA , SORT_ASC } , | {VISIT_TIMES , SORT_BY_DATA , SORT_ASC } , | |||
{VIRTUAL_HOSTS , SORT_BY_HITS , SORT_DESC } , | {VIRTUAL_HOSTS , SORT_BY_HITS , SORT_DESC } , | |||
{REFERRERS , SORT_BY_HITS , SORT_DESC } , | {REFERRERS , SORT_BY_HITS , SORT_DESC } , | |||
{REFERRING_SITES , SORT_BY_HITS , SORT_DESC } , | {REFERRING_SITES , SORT_BY_HITS , SORT_DESC } , | |||
{KEYPHRASES , SORT_BY_HITS , SORT_DESC } , | {KEYPHRASES , SORT_BY_HITS , SORT_DESC } , | |||
{STATUS_CODES , SORT_BY_HITS , SORT_DESC } , | {STATUS_CODES , SORT_BY_HITS , SORT_DESC } , | |||
{REMOTE_USER , SORT_BY_HITS , SORT_DESC } , | {REMOTE_USER , SORT_BY_HITS , SORT_DESC } , | |||
{CACHE_STATUS , SORT_BY_HITS , SORT_DESC } , | {CACHE_STATUS , SORT_BY_HITS , SORT_DESC } , | |||
#ifdef HAVE_GEOLOCATION | #ifdef HAVE_GEOLOCATION | |||
{GEO_LOCATION , SORT_BY_HITS , SORT_DESC } , | {GEO_LOCATION , SORT_BY_HITS , SORT_DESC } , | |||
{ASN , SORT_BY_HITS , SORT_DESC } , | ||||
#endif | #endif | |||
{MIME_TYPE , SORT_BY_HITS , SORT_DESC } , | {MIME_TYPE , SORT_BY_HITS , SORT_DESC } , | |||
{TLS_TYPE , SORT_BY_VISITORS , SORT_DESC } , | {TLS_TYPE , SORT_BY_VISITORS , SORT_DESC } , | |||
}; | }; | |||
/* *INDENT-ON* */ | /* *INDENT-ON* */ | |||
/* Sort an array of strings ascending */ | /* Sort an array of strings ascending */ | |||
int | int | |||
strcmp_asc (const void *a, const void *b) { | strcmp_asc (const void *a, const void *b) { | |||
return strcmp (*((char *const *) a), *((char *const *) b)); | return strcmp (*((char *const *) a), *((char *const *) b)); | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added |