Skip to content

Commit a159413

Browse files
small file name/structure tweak
1 parent 1748d77 commit a159413

File tree

7 files changed

+43
-67
lines changed

7 files changed

+43
-67
lines changed

.gitignore

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
*.dat
22

3+
*.xcuserstate
4+
35
# Object files
46
*.o
57
*.ko
@@ -24,10 +26,10 @@
2426
test
2527
make_tables
2628
sort_tables
27-
query_a
28-
query_b
29-
query_c
30-
query_d
31-
emancipate_files
29+
*query_a
30+
*query_b
31+
*query_c
32+
*query_d
33+
emancipate_tables
3234
emancipate_bplus
3335
make_bplus_trees
File renamed without changes.

make_tables.c

+22-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <string.h>
55
#include <stdbool.h>
66

7-
#include "make_tables.h"
87
#include "record.h"
98
#include "user.h"
109
#include "message.h"
@@ -14,6 +13,28 @@
1413
#include "datestamp.h"
1514
#include "file_count.h"
1615

16+
#define HASH_SIZE 1009
17+
18+
typedef struct timestamp_node {
19+
timestamp_t timestamp;
20+
struct timestamp_node *next;
21+
} timestamp_node;
22+
23+
typedef struct datestamp_node {
24+
datestamp_t datestamp;
25+
struct datestamp_node *next;
26+
} datestamp_node;
27+
28+
typedef struct city_node {
29+
city_t city;
30+
struct city_node *next;
31+
} city_node;
32+
33+
typedef struct state_node {
34+
state_t state;
35+
struct state_node *next;
36+
} state_node;
37+
1738
int main(int argc, char **argv)
1839
{
1940
//print usage if needed

make_tables.h

-47
This file was deleted.

makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
all: make_tables sort_tables query_a query_b query_c query_d emancipate_files emancipate_bplus make_bplus_trees
1+
all: make_tables sort_tables query_a query_b query_c query_d emancipate_tables emancipate_bplus make_bplus_trees
22

33

44
make_tables: make_tables.c user.c message.c timestamp.c datestamp.c city.c state.c record.c file_count.c; gcc -o make_tables make_tables.c user.c message.c timestamp.c datestamp.c city.c state.c record.c file_count.c
@@ -17,7 +17,7 @@ refactored_query_c: refactored_query_c.c user.c message.c timestamp.c datestamp.
1717
refactored_query_d: refactored_query_d.c user.c message.c timestamp.c datestamp.c city.c state.c record.c file_count.c; gcc -o refactored_query_d query_d.c user.c message.c timestamp.c city.c state.c record.c file_count.c
1818

1919

20-
emancipate_files: emancipate_files.c; gcc -o emancipate_files emancipate_files.c
20+
emancipate_tables: emancipate_tables.c; gcc -o emancipate_tables emancipate_tables.c
2121
emancipate_bplus: emancipate_bplus.c; gcc -o emancipate_bplus emancipate_bplus.c
2222

2323

raik378h-project1.xcworkspace/contents.xcworkspacedata

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)