( )⚙ D11445 dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()`

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11445

dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()`
ClosedPublic

Authored by martinvonz on Sep 16 2021, 8:06 PM.

Details

Reviewers
marmoute
Alphare
Group Reviewers
hg-reviewers
Commits
rHG2018753014be: dirstate: fix compilation warnings in `dirstate_item_set_possibly_dirty()`
Summary

Since https://phab.mercurial-scm.org/D11387 (i.e. the same patch as
mentioned in my previous patch), Clang has also started warning about
dirstate_item_set_possibly_dirty() missing an explicit return, and
about its use of the result of an assignment as a condition without
using parentheses. This patch fixes that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Sep 16 2021, 8:06 PM
Alphare added subscribers: marmoute, Alphare.Sep 17 2021, 4:41 AM

@marmoute You should have a look at this (also pinging to fix the CI today for the minisprint)

marmoute added a comment.Sep 17 2021, 8:38 AM

We should just drop the if :

self->flags |= dirstate_flag_possibly_dirty;
Py_RETURN_NONE
marmoute requested changes to this revision.Sep 17 2021, 8:39 AM
This revision now requires changes to proceed.Sep 17 2021, 8:39 AM
martinvonz edited the summary of this revision. (Show Details)Sep 17 2021, 10:55 AM
martinvonz updated this revision to Diff 30288.
martinvonz added a comment.Sep 17 2021, 10:56 AM
In D11445#175503, @marmoute wrote:

We should just drop the if :

self->flags |= dirstate_flag_possibly_dirty;
Py_RETURN_NONE

Done

Alphare accepted this revision.Sep 17 2021, 10:58 AM

Thanks

marmoute accepted this revision.Sep 17 2021, 11:00 AM

Thanks for catching this.

This revision is now accepted and ready to land.Sep 17 2021, 11:00 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/parsers.c (5 lines)

Diff 30290

mercurial/cext/parsers.c

t->mtime = mtime; t->mtime = mtime;
return (PyObject *)t; return (PyObject *)t;
}; };
/* This means the next status call will have to actually check its content /* This means the next status call will have to actually check its content
to make sure it is correct. */ to make sure it is correct. */
static PyObject *dirstate_item_set_possibly_dirty(dirstateItemObject *self) static PyObject *dirstate_item_set_possibly_dirty(dirstateItemObject *self)
{ {
if (self->flags |= dirstate_flag_possibly_dirty) { self->flags |= dirstate_flag_possibly_dirty;
Py_RETURN_NONE; Py_RETURN_NONE;
} }
}
/* See docstring of the python implementation for details */ /* See docstring of the python implementation for details */
static PyObject *dirstate_item_set_clean(dirstateItemObject *self, static PyObject *dirstate_item_set_clean(dirstateItemObject *self,
PyObject *args) PyObject *args)
{ {
int size, mode, mtime; int size, mode, mtime;
if (!PyArg_ParseTuple(args, "iii", &mode, &size, &mtime)) { if (!PyArg_ParseTuple(args, "iii", &mode, &size, &mtime)) {
return NULL; return NULL;