Skip to content

Commit

Permalink
Rename _int to _internal
Browse files Browse the repository at this point in the history
_int can be confused with 'integer'
  • Loading branch information
bsbernd committed Dec 18, 2024
1 parent 752b59a commit c9b9ca0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 16 deletions.
9 changes: 4 additions & 5 deletions lib/fuse.c
Original file line number Diff line number Diff line change
Expand Up @@ -4550,13 +4550,14 @@ static int fuse_session_loop_remember(struct fuse *f)
else
break;
} else if (res > 0) {
res = fuse_session_receive_buf_int(se, &fbuf, NULL);
res = fuse_session_receive_buf_internal(se, &fbuf,
NULL);
if (res == -EINTR)
continue;
if (res <= 0)
break;

fuse_session_process_buf_int(se, &fbuf, NULL);
fuse_session_process_buf_internal(se, &fbuf, NULL);
} else {
timeout = fuse_clean_cache(f);
curr_time(&now);
Expand Down Expand Up @@ -4774,7 +4775,7 @@ void fuse_lib_help(struct fuse_args *args)
fuse_lib_opt_proc) == -1
|| !conf.modules)
return;

char *module;
char *next;
struct fuse_module *m;
Expand All @@ -4792,8 +4793,6 @@ void fuse_lib_help(struct fuse_args *args)
}
}



static int fuse_init_intr_signal(int signum, int *installed)
{
struct sigaction old_sa;
Expand Down
10 changes: 6 additions & 4 deletions lib/fuse_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,12 @@ int fuse_start_thread(pthread_t *thread_id, void *(*func)(void *), void *arg);

void fuse_buf_free(struct fuse_buf *buf);

int fuse_session_receive_buf_int(struct fuse_session *se, struct fuse_buf *buf,
struct fuse_chan *ch);
void fuse_session_process_buf_int(struct fuse_session *se,
const struct fuse_buf *buf, struct fuse_chan *ch);
int fuse_session_receive_buf_internal(struct fuse_session *se,
struct fuse_buf *buf,
struct fuse_chan *ch);
void fuse_session_process_buf_internal(struct fuse_session *se,
const struct fuse_buf *buf,
struct fuse_chan *ch);

struct fuse *fuse_new_31(struct fuse_args *args, const struct fuse_operations *op,
size_t op_size, void *private_data);
Expand Down
2 changes: 1 addition & 1 deletion lib/fuse_loop.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ int fuse_session_loop(struct fuse_session *se)
};

while (!fuse_session_exited(se)) {
res = fuse_session_receive_buf_int(se, &fbuf, NULL);
res = fuse_session_receive_buf_internal(se, &fbuf, NULL);

if (res == -EINTR)
continue;
Expand Down
5 changes: 3 additions & 2 deletions lib/fuse_loop_mt.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ static void *fuse_do_work(void *data)
int res;

pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
res = fuse_session_receive_buf_int(mt->se, &w->fbuf, w->ch);
res = fuse_session_receive_buf_internal(mt->se, &w->fbuf,
w->ch);
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
if (res == -EINTR)
continue;
Expand Down Expand Up @@ -171,7 +172,7 @@ static void *fuse_do_work(void *data)
fuse_loop_start_thread(mt);
pthread_mutex_unlock(&mt->lock);

fuse_session_process_buf_int(mt->se, &w->fbuf, w->ch);
fuse_session_process_buf_internal(mt->se, &w->fbuf, w->ch);

pthread_mutex_lock(&mt->lock);
if (!isforget)
Expand Down
10 changes: 6 additions & 4 deletions lib/fuse_lowlevel.c
Original file line number Diff line number Diff line change
Expand Up @@ -2740,10 +2740,11 @@ static int fuse_ll_copy_from_pipe(struct fuse_bufvec *dst,
void fuse_session_process_buf(struct fuse_session *se,
const struct fuse_buf *buf)
{
fuse_session_process_buf_int(se, buf, NULL);
fuse_session_process_buf_internal(se, buf, NULL);
}

void fuse_session_process_buf_int(struct fuse_session *se,
/* libfuse internal handler */
void fuse_session_process_buf_internal(struct fuse_session *se,
const struct fuse_buf *buf, struct fuse_chan *ch)
{
const size_t write_header_size = sizeof(struct fuse_in_header) +
Expand Down Expand Up @@ -3189,8 +3190,9 @@ int fuse_session_receive_buf(struct fuse_session *se, struct fuse_buf *buf)
}

/* libfuse internal handler */
int fuse_session_receive_buf_int(struct fuse_session *se, struct fuse_buf *buf,
struct fuse_chan *ch)
int fuse_session_receive_buf_internal(struct fuse_session *se,
struct fuse_buf *buf,
struct fuse_chan *ch)
{
return _fuse_session_receive_buf(se, buf, ch, true);
}
Expand Down

0 comments on commit c9b9ca0

Please sign in to comment.