update
This commit is contained in:
parent
d8fc155229
commit
854b282a0e
12
vendorInfo.c
12
vendorInfo.c
|
@ -83,14 +83,11 @@ int main()
|
||||||
printf("%-50s %s\n", vendor_info, vendor_stock);
|
printf("%-50s %s\n", vendor_info, vendor_stock);
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
char user_purchase[50];
|
char user_purchase[50];
|
||||||
|
|
||||||
=======
|
|
||||||
char query[100];
|
char query[100];
|
||||||
read_input(query, 100);
|
read_input(query, 100);
|
||||||
search(vendors, query);
|
search(vendors, query);
|
||||||
>>>>>>> ff1cef9 (added search function, still incomplete)
|
|
||||||
|
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
free(file_buffer);
|
free(file_buffer);
|
||||||
|
@ -113,14 +110,6 @@ int read_input(char str[], int n)
|
||||||
return i;
|
return i;
|
||||||
};
|
};
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
int purchase(struct vendor_item vendors, int index, char str[], int amount)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
=======
|
|
||||||
int search(struct vendor_item vendors[MAX_VENDORS], char query[])
|
int search(struct vendor_item vendors[MAX_VENDORS], char query[])
|
||||||
{
|
{
|
||||||
int query_length = strlen(query);
|
int query_length = strlen(query);
|
||||||
|
@ -136,4 +125,3 @@ int purchase(struct vendor_item vendors[MAX_VENDORS], char str[], int amount)
|
||||||
{
|
{
|
||||||
|
|
||||||
};
|
};
|
||||||
>>>>>>> ff1cef9 (added search function, still incomplete)
|
|
||||||
|
|
Loading…
Reference in New Issue