From c425d769ad013c2f76bd15e433fbda4e66436e05 Mon Sep 17 00:00:00 2001 From: Richard Worth Date: Sat, 5 Nov 2005 20:25:11 +0000 Subject: [PATCH] * src/args.c: Renamed ttt-args.c * src/args.h: Renamed ttt-args.h * src/ttt-args.c: (ttt_args_help), (ttt_args_usage), (ttt_args_parse): Added ttt_ prefix. * src/ttt-args.h: Added ttt_, TTT_ prefix. --- ChangeLog | 13 +++++++++++++ src/{args.c => ttt-args.c} | 30 +++++++++++++++--------------- src/{args.h => ttt-args.h} | 12 ++++++------ 3 files changed, 34 insertions(+), 21 deletions(-) rename src/{args.c => ttt-args.c} (75%) rename src/{args.h => ttt-args.h} (80%) diff --git a/ChangeLog b/ChangeLog index eedf81b..2bf3f37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-11-05 Richard D. Worth + + * src/args.c: Renamed ttt-args.c + * src/args.h: Renamed ttt-args.h + * src/ttt-args.c: (ttt_args_help), (ttt_args_usage), + (ttt_args_parse): Added ttt_ prefix. + * src/ttt-args.h: Added ttt_, TTT_ prefix. + +2005-11-05 Kevin Worth + + * src/ttt-board.c: (ttt_board_init): Implemented board_init. + * src/ttt-board.h: (ttt_board_t): Added cells array. + 2005-11-05 Carl Worth * src/Makefile.am: Add ttt-board.[ch] and x.[ch] diff --git a/src/args.c b/src/ttt-args.c similarity index 75% rename from src/args.c rename to src/ttt-args.c index 5f776c9..302e301 100644 --- a/src/args.c +++ b/src/ttt-args.c @@ -1,4 +1,4 @@ -/* args.c - Parse command-line arguments for ttt using getopt +/* ttt-args.c - Parse command-line arguments for ttt using getopt * * Copyright © 2005 Carl Worth * @@ -25,14 +25,14 @@ #include #include -#include "args.h" +#include "ttt-args.h" -static const char ARGS_PROGRAM_VERSION[] = VERSION; -static const char ARGS_PROGRAM_DESCRIPTION[] = "client-server tic-tac-toe game"; -static const char ARGS_PROGRAM_BUG_ADDRESS[] = ""; +static const char TTT_ARGS_PROGRAM_VERSION[] = VERSION; +static const char TTT_ARGS_PROGRAM_DESCRIPTION[] = "client-server tic-tac-toe game"; +static const char TTT_ARGS_PROGRAM_BUG_ADDRESS[] = ""; /* XXX: SAMPLE: */ -static char ARGS_PROGRAM_ARGDOC[] = ""; +static char TTT_ARGS_PROGRAM_ARGDOC[] = ""; /* XXX: getopt is rather annoying in that you must maintain a * string-encoding of the options in addition to the table. For @@ -46,8 +46,8 @@ static char ARGS_PROGRAM_ARGDOC[] = ""; * strings, so the args_help function below must also be maintained * manually. */ -static char args_optstring[] = "hV"; -static struct option args_options[] = { +static char ttt_args_optstring[] = "hV"; +static struct option ttt_args_options[] = { /* name, has_arg, flag, val */ /* XXX: SAMPLE: {"display", 1, 0, 'd'}, @@ -58,10 +58,10 @@ static struct option args_options[] = { }; static void -args_help (const char *argv0) +ttt_args_help (const char *argv0) { - printf ("Usage: %s [OPTION] %s\n", argv0, ARGS_PROGRAM_ARGDOC); - printf ("%s - %s\n", argv0, ARGS_PROGRAM_DESCRIPTION); + printf ("Usage: %s [OPTION] %s\n", argv0, TTT_ARGS_PROGRAM_ARGDOC); + printf ("%s - %s\n", argv0, TTT_ARGS_PROGRAM_DESCRIPTION); puts (""); printf (" -h, --help\t\tGive this help list\n"); printf (" -V, --version\t\tPrint program version\n"); @@ -71,14 +71,14 @@ args_help (const char *argv0) } static void -args_usage (const char *argv0) +ttt_args_usage (const char *argv0) { - printf ("Usage: %s [OPTION] %s\n", argv0, ARGS_PROGRAM_ARGDOC); + printf ("Usage: %s [OPTION] %s\n", argv0, TTT_ARGS_PROGRAM_ARGDOC); printf ("Try `%s --help' for more information.\n", argv0); } int -args_parse(args_t *args, int argc, char *argv[], int *args_first) +ttt_args_parse(ttt_args_t *args, int argc, char *argv[], int *args_first) { char *argv0_copy = strdup (argv[0]); char *argv0 = basename (argv0_copy); @@ -90,7 +90,7 @@ args_parse(args_t *args, int argc, char *argv[], int *args_first) */ while (1) { - c = getopt_long (argc, argv, args_optstring, args_options, NULL); + c = getopt_long (argc, argv, ttt_args_optstring, ttt_args_options, NULL); if (c == -1) break; diff --git a/src/args.h b/src/ttt-args.h similarity index 80% rename from src/args.h rename to src/ttt-args.h index 6172a9e..f5e117a 100644 --- a/src/args.h +++ b/src/ttt-args.h @@ -1,4 +1,4 @@ -/* args.h - Parse command-line arguments for ttt using getopt +/* ttt-args.h - Parse command-line arguments for ttt using getopt * * Copyright © 2005 Carl Worth * @@ -19,23 +19,23 @@ * Author: Carl Worth */ -#ifndef ARGS_H -#define ARGS_H +#ifndef TTT_ARGS_H +#define TTT_ARGS_H #ifdef HAVE_CONFIG_H #include "config.h" #endif -typedef struct args +typedef struct ttt_args { /* XXX: SAMPLE: char *display; */ char *file; -} args_t; +} ttt_args_t; int -args_parse(args_t *args, int argc, char *argv[], int *args_first); +ttt_args_parse(ttt_args_t *args, int argc, char *argv[], int *args_first); #endif -- 2.43.0