Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix comments and misleading indentation #610

Merged
merged 4 commits into from
Apr 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
Tarsnap Releases
================

### Tarsnap 1.0.40
### Tarsnap 1.0.40 (February 10, 2022)

- tarsnap now accepts a --dump-config option to print the command-line and all
non-blank lines read from config files.
Expand Down
4 changes: 4 additions & 0 deletions lib/netpacket/netpacket_op.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,10 @@ reconnect(NETPACKET_CONNECTION * NPC)
return (-1);
}

/**
* netpacket_op_packetsent(cookie, status):
* Callback for packet send completion via netpacket_op interface.
*/
int
netpacket_op_packetsent(void * cookie, int status)
{
Expand Down
8 changes: 0 additions & 8 deletions lib/netproto/netproto_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ struct netproto_connection_internal * netproto_alloc(int (*)(void *), void *);
*/
int netproto_setfd(struct netproto_connection_internal *, int);

/**
* netproto_open(fd):
* Create and return a network protocol connection cookie for use on the
* connected socket ${fd}. Note that netproto_keyexchange() must be called
* before _writepacket or _readpacket are called on the cookie.
*/
struct netproto_connection_internal * netproto_open(int);

/**
* netproto_keyexchange(C, useragent, callback, cookie):
* Perform protocol negotiation and key exchange with the tarsnap server
Expand Down
4 changes: 2 additions & 2 deletions tar/chunks/chunks_directory.c
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,8 @@ chunks_directory_exists(const char * cachepath)
}

/**
* chunks_directory_free(htab, dir):
* Free the hash table ${htab} of struct chunkdata records, all of its
* chunks_directory_free(HT, dir):
* Free the hash table ${HT} of struct chunkdata records, all of its
* elements, and ${dir}.
*/
void
Expand Down
6 changes: 3 additions & 3 deletions tar/multitape/multitape_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ int multitape_metaindex_delete(STORAGE_D *, CHUNKS_D *,
int multitape_lock(const char *);

/**
* multitape_sequence(cachedir, lastseq):
* Set ${lastseq} to the sequence number of the last committed transaction
* in the cache directory ${cachedir}, or 0 if no transactions have ever been
* multitape_sequence(cachedir, seqnum):
* Set ${seqnum} to the sequence number of the last committed transaction in
* the cache directory ${cachedir}, or 0 if no transactions have ever been
* committed.
*/
int multitape_sequence(const char *, uint8_t[32]);
Expand Down
4 changes: 2 additions & 2 deletions tar/multitape/multitape_transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ multitape_lock(const char * cachedir)

/**
* multitape_sequence(cachedir, seqnum):
* Return the sequence number of the last committed transaction in the
* cache directory ${cachedir}, or 0 if no transactions have ever been
* Set ${seqnum} to the sequence number of the last committed transaction in
* the cache directory ${cachedir}, or 0 if no transactions have ever been
* committed.
*/
int
Expand Down
2 changes: 1 addition & 1 deletion tar/multitape/multitape_write.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ stream_init(struct stream * S, chunkify_callback callback, void * cookie,
if (!no_chunkifier) {
if ((S->c = chunkify_init(MEANCHUNK, MAXCHUNK, callback,
cookie)) == NULL)
goto err0;
goto err0;
} else
S->c = NULL;

Expand Down
Loading