Merge topic 'libarchive-constify-internal-get_date'
6b9a0e17
libarchive: Constify internal __archive_get_date implementation
This commit is contained in:
commit
3cca39b46d
|
@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
/* This file defines a single public function. */
|
/* This file defines a single public function. */
|
||||||
time_t __archive_get_date(time_t now, char *);
|
time_t __archive_get_date(time_t now, const char *);
|
||||||
|
|
||||||
/* Basic time units. */
|
/* Basic time units. */
|
||||||
#define EPOCH 1970
|
#define EPOCH 1970
|
||||||
|
@ -782,7 +782,7 @@ RelativeMonth(time_t Start, time_t Timezone, time_t RelMonth)
|
||||||
* Tokenizer.
|
* Tokenizer.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
nexttoken(char **in, time_t *value)
|
nexttoken(const char **in, time_t *value)
|
||||||
{
|
{
|
||||||
char c;
|
char c;
|
||||||
char buff[64];
|
char buff[64];
|
||||||
|
@ -809,7 +809,7 @@ nexttoken(char **in, time_t *value)
|
||||||
/* Try the next token in the word table first. */
|
/* Try the next token in the word table first. */
|
||||||
/* This allows us to match "2nd", for example. */
|
/* This allows us to match "2nd", for example. */
|
||||||
{
|
{
|
||||||
char *src = *in;
|
const char *src = *in;
|
||||||
const struct LEXICON *tp;
|
const struct LEXICON *tp;
|
||||||
unsigned i = 0;
|
unsigned i = 0;
|
||||||
|
|
||||||
|
@ -894,7 +894,7 @@ difftm (struct tm *a, struct tm *b)
|
||||||
* TODO: tokens[] array should be dynamically sized.
|
* TODO: tokens[] array should be dynamically sized.
|
||||||
*/
|
*/
|
||||||
time_t
|
time_t
|
||||||
__archive_get_date(time_t now, char *p)
|
__archive_get_date(time_t now, const char *p)
|
||||||
{
|
{
|
||||||
struct token tokens[256];
|
struct token tokens[256];
|
||||||
struct gdstate _gds;
|
struct gdstate _gds;
|
||||||
|
|
Loading…
Reference in New Issue