Skip to content

CFE-3275: Removed the repository destination from LogFileChange() #6348

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.

Sign up for GitHub

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

Open
nickanderson wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −10
Open

CFE-3275: Removed the repository destination from LogFileChange() #6348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions cf-agent/cf-agent-enterprise-stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@
#include <cf-agent-enterprise-stubs.h>
#include <eval_context.h>

ENTERPRISE_FUNC_8ARG_DEFINE_STUB(PromiseResult, LogFileChange,
ENTERPRISE_FUNC_7ARG_DEFINE_STUB(PromiseResult, LogFileChange,
ARG_UNUSED EvalContext *, ctx,
ARG_UNUSED const char *, file,
ARG_UNUSED int, change,
ARG_UNUSED const Attributes *, attr,
ARG_UNUSED const Promise *, pp,
ARG_UNUSED CopyRegularFileFunction, CopyRegularFilePtr,
ARG_UNUSED const char *, destination,
ARG_UNUSED DeleteCompressedArrayFunction, DeleteCompressedArrayPtr)
{
RecordNoChange(ctx, pp, attr, "Logging file differences requires version Nova or above");
Expand Down
4 changes: 2 additions & 2 deletions cf-agent/cf-agent-enterprise-stubs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ typedef bool (*CopyRegularFileFunction)(EvalContext *ctx,
AgentConnection *conn,
PromiseResult *result);
typedef void (*DeleteCompressedArrayFunction)(CompressedArray *start);
ENTERPRISE_FUNC_8ARG_DECLARE(PromiseResult, LogFileChange,
ENTERPRISE_FUNC_7ARG_DECLARE(PromiseResult, LogFileChange,
EvalContext *, ctx,
const char *, file,
int, change,
const Attributes *, attr,
const Promise *, pp,
CopyRegularFileFunction, CopyRegularFilePtr,
const char *, destination, DeleteCompressedArrayFunction, DeleteCompressedArrayPtr);
DeleteCompressedArrayFunction, DeleteCompressedArrayPtr);

ENTERPRISE_VOID_FUNC_1ARG_DECLARE(void, ReportPatches, PackageManager *, list);
ENTERPRISE_VOID_FUNC_1ARG_DECLARE(void, Nova_TrackExecution, const char *, input_file);
Expand Down
7 changes: 1 addition & 6 deletions cf-agent/verify_files_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3738,12 +3738,7 @@ static PromiseResult VerifyFileIntegrity(EvalContext *ctx, const char *file, con

if (attr->change.report_diffs && MakingInternalChanges(ctx, pp, attr, &result, "report diffs in '%s'", file))
{
char destination[CF_BUFSIZE];
if (!GetRepositoryPath(file, attr, destination))
{
destination[0] = '\0';
}
LogFileChange(ctx, file, changed, attr, pp, &CopyRegularFile, destination, &DeleteCompressedArray);
LogFileChange(ctx, file, changed, attr, pp, &CopyRegularFile, &DeleteCompressedArray);
}

return result;
Expand Down
Loading