aboutsummaryrefslogtreecommitdiffstats
path: root/sharkd_session.c
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2021-07-07 22:43:29 -0700
committerGuy Harris <gharris@sonic.net>2021-07-08 00:05:35 -0700
commitdd5907d2a3f6d0ac572a76770b43422b0b82c2ab (patch)
tree88c706f42fc5b21ee0f9d12e949a02f16651a554 /sharkd_session.c
parent6dfa2cb0ae4f15d171da8cf77f2a6e11d35d0d86 (diff)
Consistently refer to blocks that have been modified as "modified".
"User" sounds as if the blocks belong to the user; at most, the current user might have modified them directly, but they might also have, for example, run a Lua script that, unknown to them, modified comments. Also, a file might have "user comments" added by a previous user, who them wrote the file and and provided it to the current user. "Modified" seems a bit clearer than "changed".
Diffstat (limited to 'sharkd_session.c')
-rw-r--r--sharkd_session.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sharkd_session.c b/sharkd_session.c
index c282a6a439..1f542dd211 100644
--- a/sharkd_session.c
+++ b/sharkd_session.c
@@ -1444,9 +1444,9 @@ sharkd_session_process_frames(const char *buf, const jsmntok_t *tokens, int coun
sharkd_json_value_anyf("num", "%u", framenum);
- if (fdata->has_user_block || fdata->has_phdr_block)
+ if (fdata->has_modified_block || fdata->has_phdr_block)
{
- if (!fdata->has_user_block || sharkd_get_user_block(fdata) != NULL)
+ if (!fdata->has_modified_block || sharkd_get_modified_block(fdata) != NULL)
sharkd_json_value_anyf("ct", "true");
}
@@ -3355,8 +3355,8 @@ sharkd_session_process_frame_cb(epan_dissect_t *edt, proto_tree *tree, struct ep
sharkd_json_result_prologue(rpcid);
- if (fdata->has_user_block)
- pkt_block = sharkd_get_user_block(fdata);
+ if (fdata->has_modified_block)
+ pkt_block = sharkd_get_modified_block(fdata);
else if (fdata->has_phdr_block)
pkt_block = pi->rec->block;
@@ -4241,7 +4241,7 @@ sharkd_session_process_setcomment(char *buf, const jsmntok_t *tokens, int count)
}
else
{
- sharkd_set_user_block(fdata, pkt_block);
+ sharkd_set_modified_block(fdata, pkt_block);
sharkd_json_simple_ok(rpcid);
}